183 files changed, 82625 insertions, 77770 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/.gitmodules b/.gitmodules
deleted file mode 100644
index a61f97326..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "telepathy-yell"]
-	path = telepathy-yell
-	url = git://anongit.freedesktop.org/telepathy/telepathy-yell.git
diff --git a/HACKING b/HACKING
index 778244f11..073f9f2b6 100644
--- a/HACKING
+++ b/HACKING
@@ -1,2 +1,35 @@
+Empathy is split in different processes:
+- src/empathy: contact list, considered as the main UI
+- src/empathy-chat: chat UI
+- src/empathy-call: call UI
+- src/empathy-accounts: UI to configure IM accounts
+- src/empathy-debugger: debug tool
+
+Each process can be run directly from source without having to be installed to
+its prefix. You just have to define an appropriate environment using the
+wrapper found in the tools/ directory.. For example:
+  ./tools/empathy-env ./src/empathy
+
+The chat and call UI are automatically started by telepathy-mission-control
+when receiving or requesting a chat/call. In order to use your custom version
+you have to kill any existing instance of empathy-{chat,call} and then start
+it with EMPATHY_PERSIST=1 to prevent it from auto exiting if there is no
+channel to handle. For example:
+  EMPATHY_PERSIST=1 ./tools/empathy-env ./src/empathy-chat
+
+Debugging can be turned on using EMPATHY_DEBUG=all and logged to a file
+with EMPATHY_LOGFILE=/tmp/empathy.log
+
+Sometimes you may want to load the locally compiled version of some GStreamer
+plugin (e.g. Farstream) instead of the system installed one. To do so, just
+set the GST_PLUGIN_PATH environment variable to tell GStreamer where your
+plugins are located and the GST_PLUGIN_LOADING_WHITELIST to avoid conflicts
+with system installed plugins. It's also a good idea to use GST_REGISTRY to
+avoid clobbering your default GStreamer registry. For example you can
+export these before launching the empathy processes as shown above:
+  export GST_PLUGIN_LOADING_WHITELIST=gstreamer:gst-plugins-base:gst-plugins-good:libnice:valve:siren:autoconvert:rtpmux:dtmf:mimic:shm
+  export GST_PLUGIN_PATH=/path/to/your/custom/lib/gstreamer-0.10
+  export GST_REGISTRY=/tmp/gstreamer.registry
+
 See http://live.gnome.org/Empathy/ about coding style conventions.
 See also http://live.gnome.org/Empathy/Git to read about our git workflow.
diff --git a/Makefile.am b/Makefile.am
index f86a3a46f..1a3a118b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
+MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
 GOA_SUBDIRS = goa-mc-plugin
 
diff --git a/NEWS b/NEWS
index df6866024..8ae9432ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,204 @@
+NEW in 3.3.91 (06/03/2012)
+=============
+
+Bugs fixed:
+ - Fixed #661515, Wrong date is shown in chat window
+ - Fixed #671447, Make running empathy componenents without installing them simpler (Emanuele Aina)
+ - Fixed #671452, Avoid XMPP accounts to have a negative priority (Guillaume Desmottes)
+
+Translations:
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated zh_CN Translation (YunQiang Su)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+NEW in 3.3.90.2 (02/03/2012)
+===============
+
+This release optionally brings back empathy-av, the old call UI which has been
+removed in 3.3.90. You'll have to pass --enable-empathy-av to configure in
+order to build it. empathy-av is now using telepathy-farstream instead of
+telepathy-farsight and so shares the same dependencies as empathy-call.
+This is really legacy code, we are not going to continue
+maintaining it so most distributions shouldn't enable it and just use
+empathy-call.
+
+Dependencies:
+ • yelp-tools
+ • yelp-xsl
+
+Bugs fixed:
+ - Fixed #656676, Use new documentation infrastructure (Javier Jardón)
+ - Fixed #671061, Debug: Clear doesn't work for the All option (Chandni Verma)
+
+Translations:
+ - Updated ar Translation (Ibrahim Saed)
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated pt_BR Translation (Jonh Wendell)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sl Translation (Matej Urban�i�)
+ - Updated ta Translation (Dr.T.Vasudevan)
+ - Updated ug Translation (Gheyret Kenji)
+
+Documentation translations:
+ - Updated gl Documentation translation (Fran Diéguez)
+
+NEW in 3.3.90.1 (24/02/2012)
+===============
+
+A small release fixing the installation of the user documentation and a
+build problem.
+We also fixed a bunch of memory leaks in the new call window.
+
+Bugs fixed:
+ - Fixed #670638, 3.3.90 still includes farsight headers (Gert Kulyk)
+
+Translations:
+ - Updated bg Translation (Alexander Shopov)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated pa Translation (A S Alam)
+ - Updated sr@latin Translation (Миро�лав �иколић)
+ - Updated sr Translation (Миро�лав �иколић)
+
+Documentation translations:
+ - Updated it Documentation translation (Guillaume Desmottes)
+
+NEW in 3.3.90 (21/02/2012)
+=============
+
+The "125 files changed, 33088 insertions(+), 43358 deletions(-)" release.
+
+This is the first beta release in the 3.4 cycle and it's massive!
+
+Our new call UI has finally landed. It uses Clutter and Farstream and so
+introduces a bunch of new dependencies. You'll need the soon-to-be-released
+telepathy-gabble 0.15.4 to use it. SIP is not yet usable with this new UI,
+a future release of telepathy-rakia should fix that soon. Regressions have
+to be expected so please make sure to include Empathy.Call logs when reporting
+bugs.
+
+This release also stops using telepathy-butterfly and now relies on
+telepathy-haze to connect to MSN. Accounts should be automatically migrated
+with the next telepathy-mission-control release (5.11.0) (if telepathy-haze is
+installed). We recommend that distributions install it by default if they were
+previously installing telepathy-butterfly.
+
+Empathy now relies on gnome-contacts to display contacts' details and link
+contacts together. If gnome-contacts is not installed, Empathy will suggest
+to install it using PackageKit. Distributions should consider adding a
+dependency on gnome-contacts.
+
+The accounts assistant has been removed and its features integrated into
+the accounts dialog.
+
+The debug window gained the ability to display the logs from all the
+components together and to upload them easily to pastebin.
+
+Dependencies:
+ • clutter ≥ 1.7.14
+ • clutter-gst
+ • clutter-gtk
+ • farstream
+ • telepathy-farstream ≥ 0.2.1
+ • telepathy-glib ≥ 0.17.5
+ • farsight2 and telepathy-farsight are no longer needed
+
+Bugs fixed:
+ - Fixed #629902, New call UI (Nick Richards, Emilio Pozuelo Monfort & friends)
+ - Fixed #659683, Make empathy-call the default and remove empathy-av (Guillaume Desmottes)
+ - Fixed #652669, refactor account creation (Guillaume Desmottes)
+ - Fixed #592994, Debug: Store messages for each component in a separate GtkListStore and have them copied(and later updated with each new message) in a separate store for a new "All"(selected by default) selection. (Chandni Verma)
+ - Fixed #627658, Function Hide Group (Guillaume Desmottes)
+ - Fixed #632739, Unclear string for translation (Guillaume Desmottes)
+ - Fixed #646654, Empathy subscription request dialog box should be more helpful (Brian Curtis)
+ - Fixed #655101, dnd from contact list to a chat should invite the contact to the chat (Guillaume Desmottes)
+ - Fixed #656097, Empathy should show an informative text inside the contact list when no contacts are online (Guillaume Desmottes)
+ - Fixed #658724, "Send to pastebin" button for debug window (Chandni Verma)
+ - Fixed #663627, Having a long status message makes infobar in accounts dialog uglier (Guillaume Desmottes)
+ - Fixed #663829, Butterfly -> Haze migration (Guillaume Desmottes)
+ - Fixed #664045, Tab tooltips do not show (client type-triggered) phone symbols (Guillaume Desmottes)
+ - Fixed #668985, [PATCH] Toggle telling others you are typing to them (Patrick F. Allen)
+ - Fixed #669482, Rely on gnome-contacts to link contacts (Guillaume Desmottes)
+ - Fixed #669559, Rely on gnome-contacts for the information dialog (Guillaume Desmottes)
+ - Fixed #669578, Be able to install gnome-contacts using PackageKit (Guillaume Desmottes)
+ - Fixed #669655, "Contact Details" title in accounts dialog (Guillaume Desmottes)
+ - Fixed #669676, Opening gnome-contacts from Chat dialog doesn't work for metacontacts (Guillaume Desmottes)
+ - Fixed #669695, ContactInfo: always escape IRC channel names in markup (Will Thompson)
+ - Fixed #669712, Should not allow the user to set a negative priority on XMPP (Guillaume Desmottes)
+ - Fixed #669823, Don't unhighlight chat tabs when more messages are received (Will Thompson)
+ - Fixed #670201, import dialog improvements (Guillaume Desmottes)
+ - Fixed #670203, empathy-accounts improvements (Guillaume Desmottes)
+
+Translations:
+ - Updated ar Translation (Anas Afif Emad)
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated bg Translation (Alexander Shopov)
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated en_CA Translation (Tiffany Antopolski)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated ja Translation (Mako N)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sr@latin Translation (Миро�лав �иколић)
+ - Updated sr Translation (Миро�лав �иколић)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated zh_CN Translation (Wylmer Wang)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach, Mario Blättermann)
+ - Updated es Documentation translation (Daniel Mustieles)
+ - Updated fr Documentation translation (Bruno Brouard)
+
+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/PASTEBIN-API-KEY.txt b/PASTEBIN-API-KEY.txt
new file mode 100644
index 000000000..71c8e9c36
--- /dev/null
+++ b/PASTEBIN-API-KEY.txt
@@ -0,0 +1,110 @@
+MIME-Version: 1.0
+Received: by 10.231.11.1 with HTTP; Tue, 11 Oct 2011 22:59:10 -0700 (PDT)
+In-Reply-To:
+<CADttZZpfye8-Pi9=UDK3OUq8NmsagYV5AF_oewVNEUMRp7joFg@mail.gmail.com>
+References: <CADttZZoDLnv+aoZBPLcHT43-yKCH8LB+3objC-ST1qRp3P3Lnw@mail.gmail.com>
+    <CACuygeBuekJwr3t+7GxLA8Ft+A-Q6QmZUhe_2VU2LozSYduYxQ@mail.gmail.com>
+    <CADttZZqadJP3441etHxd2JFmNCqqHxDhg-uiCqqV=Qs3hUCynA@mail.gmail.com>
+    <CADttZZrWAw7hjQb1+qN+4z42d10FEWwOvLG-P_s85Htf_fwbEg@mail.gmail.com>
+    <CACuygeCOpAmYBogzay2VOb7SGnEhLsKfeaU-07QXQG=mj-ZRfg@mail.gmail.com>
+    <CADttZZrmrz5Dr7d9THQsSPJtWvy_P_-vkAx=UDcUEo_c+RE2nQ@mail.gmail.com>
+    <CADttZZqGfRUjcr8Cppz5oWniXwmreomd3wshCBzwx1E32A=Kdw@mail.gmail.com>
+    <CACuygeDDcW1NZYGCzTuxAUrJ92BgEnG+0ewME-yhR03Pwvd02A@mail.gmail.com>
+    <CADttZZpfye8-Pi9=UDK3OUq8NmsagYV5AF_oewVNEUMRp7joFg@mail.gmail.com>
+Date: Wed, 12 Oct 2011 11:29:10 +0530
+Delivered-To: chandniverma2112@gmail.com
+Message-ID: <CADttZZrP+XkPtNgAzxM56WkQAT72hjcQD0Z1UcFj8=q86Cpxeg@mail.gmail.com>
+Subject: Re: API issues
+From: Chandni Verma <chandniverma2112@gmail.com>
+To: Pastebin Support <admin@pastebin.com>
+Content-Type: multipart/alternative; boundary=001636ef068e08c10c04af13b9e5
+
+--001636ef068e08c10c04af13b9e5
+Content-Type: text/plain; charset=ISO-8859-1
+
+Hi Admin,
+
+One thing which I want to ask you since it it not answered anywhere on the
+pastebin.com website is that who is allowed to use the API developer key in
+their codes. Are there any licences to keep in mind?
+It's crucial to the open source project I have used the pastebin API for.
+
+Can we publish a member's (my) key in the open source code?
+
+Regards,
+Chandni
+
+_______
+
+Delivered-To: chandniverma2112@gmail.com
+Received: by 10.231.11.1 with SMTP id r1cs44531ibr;
+        Wed, 12 Oct 2011 02:27:32 -0700 (PDT)
+Return-Path: <godius@gmail.com>
+Received-SPF: pass (google.com: domain of godius@gmail.com designates
+10.182.187.100 as permitted sender) client-ip=10.182.187.100;
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of
+godius@gmail.com designates 10.182.187.100 as permitted sender)
+smtp.mail=godius@gmail.com; dkim=pass header.i=godius@gmail.com
+Received: from mr.google.com ([10.182.187.100])
+        by 10.182.187.100 with SMTP id fr4mr13834663obc.79.1318411651457
+(num_hops = 1);
+        Wed, 12 Oct 2011 02:27:31 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=gmail.com; s=gamma;
+        h=mime-version:sender:in-reply-to:references:date
+         :x-google-sender-auth:message-id:subject:from:to:content-type;
+        bh=pv3X2ILKj91U9H2lw/fwrkHPzZRFCaB8pPO2Y6pBzSA=;
+        b=T2XQR8CcrP3jF/9wJPYJxBQPToZp2ckFMelfmdRFd7akc6f8iEQRXUjEsYXvRPbuzS
+         6TWaTHiT0QLBZaqh1D6AifP2E4m84H+h8LwEkYXXAN4dJyTIbAM8rQ5KfbTiaoKzuv48
+         7dS26KA2YOB1bWTlhEm0zW4bdPCGSBxsCW67Y=
+MIME-Version: 1.0
+Received: by 10.182.187.100 with SMTP id fr4mr13834663obc.79.1318411651452;
+ Wed, 12 Oct 2011 02:27:31 -0700 (PDT)
+Sender: godius@gmail.com
+Received: by 10.182.118.36 with HTTP; Wed, 12 Oct 2011 02:27:31 -0700 (PDT)
+In-Reply-To:
+<CADttZZrP+XkPtNgAzxM56WkQAT72hjcQD0Z1UcFj8=q86Cpxeg@mail.gmail.com>
+References: <CADttZZoDLnv+aoZBPLcHT43-yKCH8LB+3objC-ST1qRp3P3Lnw@mail.gmail.com>
+    <CACuygeBuekJwr3t+7GxLA8Ft+A-Q6QmZUhe_2VU2LozSYduYxQ@mail.gmail.com>
+    <CADttZZqadJP3441etHxd2JFmNCqqHxDhg-uiCqqV=Qs3hUCynA@mail.gmail.com>
+    <CADttZZrWAw7hjQb1+qN+4z42d10FEWwOvLG-P_s85Htf_fwbEg@mail.gmail.com>
+    <CACuygeCOpAmYBogzay2VOb7SGnEhLsKfeaU-07QXQG=mj-ZRfg@mail.gmail.com>
+    <CADttZZrmrz5Dr7d9THQsSPJtWvy_P_-vkAx=UDcUEo_c+RE2nQ@mail.gmail.com>
+    <CADttZZqGfRUjcr8Cppz5oWniXwmreomd3wshCBzwx1E32A=Kdw@mail.gmail.com>
+    <CACuygeDDcW1NZYGCzTuxAUrJ92BgEnG+0ewME-yhR03Pwvd02A@mail.gmail.com>
+    <CADttZZpfye8-Pi9=UDK3OUq8NmsagYV5AF_oewVNEUMRp7joFg@mail.gmail.com>
+    <CADttZZrP+XkPtNgAzxM56WkQAT72hjcQD0Z1UcFj8=q86Cpxeg@mail.gmail.com>
+Date: Wed, 12 Oct 2011 11:27:31 +0200
+X-Google-Sender-Auth: cXD_1Zj39UiHBWVSdEJRk04LVC8
+Message-ID: <CACuygeDAqGCP+=KsV+ZyxNuLoy9L0CTQ63NpRhrig-9bzeFp6A@mail.gmail.com>
+Subject: Re: API issues
+From: Pastebin Support <admin@pastebin.com>
+To: Chandni Verma <chandniverma2112@gmail.com>
+Content-Type: multipart/alternative; boundary=14dae9398ea5270f6904af16a25e
+
+--14dae9398ea5270f6904af16a25e
+Content-Type: text/plain; charset=ISO-8859-1
+
+Hello,
+
+Yes you can use your api developer key in the open for your project.
+Regards,
+
+Pastebin
+
+
+On Wed, Oct 12, 2011 at 7:59 AM, Chandni Verma
+<chandniverma2112@gmail.com>wrote:
+
+> Hi Admin,
+>
+> One thing which I want to ask you since it it not answered anywhere on the
+> pastebin.com website is that who is allowed to use the API developer key
+> in their codes. Are there any licences to keep in mind?
+> It's crucial to the open source project I have used the pastebin API for.
+>
+> Can we publish a member's (my) key in the open source code?
+>
+> Regards,
+> Chandni
+>
diff --git a/autogen.sh b/autogen.sh
index 7c73adb9f..2753d641c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,17 +18,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-# Fetch submodules if needed
-if test ! -f telepathy-yell/autogen.sh;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
-# launch tp-yell's autogen.sh
-cd telepathy-yell
-sh autogen.sh --no-configure
-cd ..
-
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index ecb2dad16..6e5caeceb 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], [91])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -35,23 +35,34 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.6.6
-GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
+
+GLIB_REQUIRED=2.30.0
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+
 GTK_REQUIRED=3.0.2
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_0, [Ignore post 3.0 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_0, [Prevent post 3.0 APIs])
+
+CLUTTER_REQUIRED=1.8.0
+AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
+AC_DEFINE(CLUTTER_VERSION_MAX, CLUTTER_VERSION_1_8, [Prevent post 1.8 APIs])
+
+CLUTTER_GTK_REQUIRED=0.90.3
+
 GSTREAMER_REQUIRED=0.10.32
 KEYRING_REQUIRED=2.26.0
 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_FARSTREAM_REQUIRED=0.2.1
+TELEPATHY_GLIB_REQUIRED=0.17.5
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
 
 # Optional deps
-CLUTTER_REQUIRED=1.7.14
-CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
@@ -66,20 +77,6 @@ CHAMPLAIN_REQUIRED=0.12.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# Disable GLib deprecation warnings for now; we don't want to bump the GLib dep
-# and make things harder for contributiors without good reason. We'll re-enable
-# those warnings later during the cycle (bgo #662662)
-AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
-
-# telepathy-yell
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-ac_configure_args="$ac_configure_args --disable-shared-library"
-AX_CONFIG_DIR([telepathy-yell])
-ac_top_build_prefix=$prev_top_build_prefix
-ac_configure_args=$prev_ac_configure_args
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -103,7 +100,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`
@@ -204,48 +200,35 @@ PKG_CHECK_MODULES(EMPATHY,
    libsoup-2.4
 ])
 
-PKG_CHECK_MODULES(YELL, [telepathy-yell])
-
-PKG_CHECK_MODULES(EMPATHY_AV,
+PKG_CHECK_MODULES(EMPATHY_CALL,
 [
-   farsight2-0.10
-   telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
+   farstream-0.1
+   telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   clutter-1.0 >= $CLUTTER_REQUIRED
+   clutter-gtk-1.0
+   clutter-gst-1.0
 ])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
 # -----------------------------------------------------------
-# Call interface
+# Build empathy-av?
 # -----------------------------------------------------------
-AC_ARG_ENABLE(call,
-            AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
-            [build with Call interface support]),,
-            [enable_call=auto])
-if test "x$enable_call" != "xno" ; then
-   PKG_CHECK_MODULES(EMPATHY_CALL,
+AC_ARG_ENABLE(empathy-av,
+            AS_HELP_STRING([--enable-empathy-av=@<:@no/yes@:>@],
+            [build empathy-av (legacy call UI)]),,
+            [enable_empathy_av=no])
+if test "x$enable_empathy_av" != "xno" ; then
+   PKG_CHECK_MODULES(EMPATHY_AV,
    [
-      farsight2-0.10
-      telepathy-farstream >= 0.1.2
-      clutter-1.0 >= $CLUTTER_REQUIRED
-      clutter-gtk-1.0
-      clutter-gst-1.0
-   ], have_call="yes", have_call="no" )
-
-   if test "x$have_call" = "xyes"; then
-      AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
-   fi
-else
-  have_call=no
+      farstream-0.1
+      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   ])
+   AC_DEFINE(HAVE_EMPATHY_AV, 1, [Define if you have StreamedMedia channel support])
+   have_empathy_av=yes
 fi
-
-if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
-   AC_MSG_ERROR([Could not find Call handler dependencies:
-
-$EMPATHY_CALL_PKG_ERRORS])
-fi
-AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
-
+AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
 
 # -----------------------------------------------------------
 # Call support in tp-logger
@@ -311,9 +294,6 @@ fi
 # -----------------------------------------------------------
 IT_PROG_INTLTOOL([0.40.0])
 
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
 GETTEXT_PACKAGE=empathy
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
@@ -643,6 +623,8 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# Help documentation
+YELP_HELP_INIT
 
 # -----------------------------------------------------------
 # Coding style checks
@@ -703,6 +685,6 @@ Configure summary:
 	Nautilus-sendto plugin......:  ${have_nst}
 	GOA MC plugin...............:  ${have_goa}
 	Salut E-D-S support.........:  ${with_eds}
-	Exp. Call channel handler...:  ${have_call}
 	Exp. Call log support.......:  ${have_call_logs}
+	empathy-av (legacy).........:  ${enable_empathy_av}
 "
diff --git a/data/.gitignore b/data/.gitignore
index e004da8ed..2d4a96f0c 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -2,6 +2,7 @@ empathy.desktop
 empathy.desktop.in
 org.gnome.Empathy.gschema.valid
 org.gnome.Empathy.gschema.xml
+gschemas.compiled
 org.freedesktop.Telepathy.Client.Empathy.Chat.service
 org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
 org.freedesktop.Telepathy.Client.Empathy.Call.service
@@ -9,3 +10,4 @@ empathy-accounts.desktop
 empathy-accounts.desktop.in
 org.freedesktop.Telepathy.Client.Empathy.Auth.service
 org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service
+icons/local-copy/*
diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client
index 259025d86..b24cd8d71 100644
--- a/data/Empathy.Call.client
+++ b/data/Empathy.Call.client
@@ -2,20 +2,22 @@
 Interfaces=org.freedesktop.Telepathy.Client.Handler
 
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
 
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=true
+org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudio b=true
 
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=true
+org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideo b=true
 
 [org.freedesktop.Telepathy.Client.Handler.Capabilities]
-org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/ice-udp=true
-org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/gtalk-p2p=true
-org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video/h264=true
+org.freedesktop.Telepathy.Channel.Type.Call1/audio=true
+org.freedesktop.Telepathy.Channel.Type.Call1/video=true
+org.freedesktop.Telepathy.Channel.Type.Call1/ice=true
+org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p=true
+org.freedesktop.Telepathy.Channel.Type.Call1/video/h264=true
diff --git a/data/Makefile.am b/data/Makefile.am
index a08ed620d..a2be750cf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,6 +15,13 @@ gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
+# We need to compile schemas at make time
+# to run from source tree
+gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
+
+all-local: gschemas.compiled
+
 convertdir = $(datarootdir)/GConf/gsettings
 convert_DATA = \
 	empathy.convert
@@ -22,13 +29,13 @@ convert_DATA = \
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
 	org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
-	org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.Auth.service.in \
+	org.freedesktop.Telepathy.Client.Empathy.Call.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in
 
-if HAVE_CALL
+if HAVE_EMPATHY_AV
 servicefile_in_files += \
-	org.freedesktop.Telepathy.Client.Empathy.Call.service.in
+	org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
 endif
 
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
@@ -51,13 +58,13 @@ org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service: org.freedesktop.T
 clientfiledir = $(datarootdir)/telepathy/clients
 clientfile_DATA = \
 	Empathy.Chat.client \
-	Empathy.AudioVideo.client \
 	Empathy.Auth.client \
+	Empathy.Call.client \
 	Empathy.FileTransfer.client
 
-if HAVE_CALL
+if HAVE_EMPATHY_AV
 clientfile_DATA += \
-	Empathy.Call.client
+	Empathy.AudioVideo.client
 endif
 
 htmldir = $(datadir)/empathy
@@ -82,4 +89,5 @@ DISTCLEANFILES = 		\
 	$(schemas_DATA)		\
 	$(servicefile_DATA)	\
 	$(gsettings_SCHEMAS)	\
+	gschemas.compiled	\
 	$(NULL)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 56ad3312f..4bac794d6 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -192,6 +192,8 @@ EXTRA_DIST = \
 	local-xmpp.svg		\
 	$(NULL)
 
+include $(srcdir)/utils.mk
+
 ###############################################################################
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t
@@ -252,3 +254,31 @@ uninstall-icons:
 install-data-local: install-icons update-icon-cache
 
 uninstall-local: uninstall-icons update-icon-cache
+
+# Local copy of the "installed" icon. This is used to be able to run empathy
+# from source (see bgo #616159)
+local_icons_dir = local-copy
+
+# Generate the lists of destination paths
+public_icons_local_install_paths = $(foreach obj, $(public_icons), $(local_icons_dir)/$(subst _,/,$(call reorder,_,1 3 2 4,$(obj))))
+private_icons_local_install_paths = $(foreach obj, $(private_icons), $(local_icons_dir)/$(subst _,/,$(call reorder,_,1 3 2 4,$(obj))))
+
+# For each destination path we'll need to compute back the original icon
+# and create a rule that will ensure that the destination directory exists
+# and then copy the original file
+define icon_local_install_rule_template
+$(local_icons_dir)/$$(subst _,/,$$(call reorder,_,1 3 2 4,$1)): $1
+	$$(AM_V_GEN)mkdir -p $$(@D)
+	$$(AM_V_GEN)cp $$^ $$@
+endef
+
+# Instantiate the template above for each icon
+$(foreach icon,$(public_icons),$(eval $(call icon_local_install_rule_template,$(icon))))
+$(foreach icon,$(private_icons),$(eval $(call icon_local_install_rule_template,$(icon))))
+
+install-icons-src: $(public_icons_local_install_paths) $(private_icons_local_install_paths)
+
+all: install-icons-src
+
+clean-local:
+	-rm -rf $(local_icons_dir)
diff --git a/data/icons/utils.mk b/data/icons/utils.mk
new file mode 100644
index 000000000..84b1c8207
--- /dev/null
+++ b/data/icons/utils.mk
@@ -0,0 +1,11 @@
+# define a variable containing a single space
+blank :=
+space := $(blank) $(blank)
+# split string $3 with $1 as separator and return the token in position $2
+define token
+$(word $2, $(subst $1, ,$3))
+endef
+# split string $3 with $1 as separator and reassemble it using the indexes in $2
+define reorder
+$(subst $(space),$1,$(foreach i,$2,$(call token,$1,$i,$3)))
+endef
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index f3975fce2..8901d2138 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -28,6 +28,11 @@
       <_summary>Empathy default download folder</_summary>
       <_description>The default folder to save file transfers in.</_description>
     </key>
+    <key name="sanity-cleaning-number" type="u">
+      <default>0</default>
+      <_summary>Magic number used to check if sanity cleaning tasks should be run</_summary>
+      <_description>empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually.</_description>
+    </key>
     <child name="ui" schema="org.gnome.Empathy.ui"/>
     <child name="contacts" schema="org.gnome.Empathy.contacts"/>
     <child name="sounds" schema="org.gnome.Empathy.sounds"/>
@@ -88,12 +93,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 +211,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/.gitignore b/help/.gitignore
index 1a0f153ad..b14eec781 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -1,5 +1,6 @@
 *.mo
 *.omf
+*/*.stamp
 ca/*.page
 ca/*.xml
 cs/*.page
@@ -24,6 +25,7 @@ hu/*.page
 hu/*.xml
 it/*.page
 it/*.xml
+lv/*.page
 pl/*.page
 pl/*.xml
 ru/*.page
diff --git a/help/Makefile.am b/help/Makefile.am
index 45aa010cc..3290b9b26 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+@YELP_HELP_RULES@
 
-DOC_ID = empathy
-DOC_FIGURES = \
+HELP_ID = empathy
+HELP_MEDIA = \
 	figures/audio-input-microphone.png \
 	figures/available.png \
 	figures/away.png \
@@ -14,7 +14,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 +61,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 lv 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 3257a789e..5fd837aeb 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 18:47+0000\n"
-"PO-Revision-Date: 2012-01-21 11:20+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,1800 +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:19(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:20(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:23(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/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "Detalles de la cuenta IRC"
 
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Tipos de estados e iconos"
+#: 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 ""
+"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:39(media)
-msgid "Available icon"
-msgstr "Icono de disponible"
+#: 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 ""
+"Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
+"IRC en <app>Empathy</app>."
 
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Disponible"
+#: 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: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 ""
-"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"
+"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:46(gui)
-msgid "Busy"
-msgstr "Ocupado"
+#: C/account-irc.page:53(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Alias</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 ""
-"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"
+"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:54(gui)
-msgid "Away"
-msgstr "Ausente"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Contraseña</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 ""
-"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"
+"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/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisible"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "Contraseñas NickServ"
 
-#: 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 ""
-"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."
+"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/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Desconectado"
+#: C/account-irc.page:76(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Nombre real</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 ""
-"Establecer su estado como <em>Desconectado</em> le desconecta de todas sus "
-"cuentas."
+"Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán "
+"verlo al ver su información."
 
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Mostrar su escritorio a sus contactos."
+#: 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: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 ""
+"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/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+#: C/account-irc.page:94(info/title)
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "Redes IRC"
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Compartir su escritorio"
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Redes"
 
-#: 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 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."
+"<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: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."
-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."
-
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
+"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 ""
-"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
-"siguientes:"
+"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:56(p)
+#: C/account-irc.page:107(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 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 ""
-"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>."
+"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:63(p)
+#: C/account-irc.page:110(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>."
+"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 ""
-"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>."
+"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:71(p)
+#: C/account-irc.page:115(section/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."
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
-"Se enviará una invitación para ver su escritorio al contacto que haya "
-"seleccionado. Deberán aceptarla para poder ver su escritorio."
+"Al añadir o modificar una red puede introducir la siguiente información:"
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:121(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
+"This is the name of the network as you want it to appear in the list of "
+"networks."
 msgstr ""
-"Puede desconectar el contacto de su equipo usando su aplicación de "
-"compartición de escritorio."
+"Este es el nombre de la red como quiere que aparezca en la lista de redes."
 
-#: C/share-desktop.page:82(p)
-msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr ""
-"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:125(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Conjunto de caracteres</gui>"
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"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 ""
-"Cuando comparte su escritorio con otros, es posible que experimente una "
-"ralentización del rendimiento del sistema y una baja velocidad de Internet."
+"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/share-desktop.page:96(p)
+#: C/account-irc.page:135(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."
+"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 ""
-"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"
+"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/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Establecer un mensaje personalizado"
+#: 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:36(p)
+#: C/account-irc.page:142(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."
+"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 ""
-"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."
+"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:40(p)
+#: C/account-irc.page:147(item/p)
 msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
+"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 ""
-"Es posible establecer un mensaje personalizado basado en los diferentes "
-"estados disponibles."
+"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:46(p) C/set-custom-status.page:82(p)
+#: C/account-irc.page:151(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
+"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 ""
-"Desde la ventana <gui>Lista de contactos</gui>, pulse en la lista "
-"desplegable en la parte superior."
+"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/set-custom-status.page:52(p)
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Detalles de la cuenta Jabber"
+
+#: C/account-jabber.page:31(page/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>."
+"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 ""
-"Seleccione el estado al que quiere añadir el mensaje personalizado. Tiene "
-"que seleccionar el identificado con la etiqueta <gui>Mensaje personalizado</"
-"gui>."
+"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:58(p)
+#: C/account-jabber.page:39(note/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."
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
 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."
+"Google Talk es un tipo de cuenta Jabber. Estas instrucciones también "
+"funcionan para cuentas de Google Talk."
 
-#: 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."
+#: 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/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/account-jabber.page:47(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."
+"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 ""
-"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."
+"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:69(p)
+#: C/account-jabber.page:52(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."
+"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 ""
-"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 "To remove a custom message:"
-msgid "Edit and remove a custom message"
-msgstr "Editar y quitar un mensaje personalizado"
+"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:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
+#: 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:95(p)
-msgid "To edit a custom message:"
-msgstr "Para editar un mensaje personalizado:"
+#: C/account-jabber.page:60(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioridad</gui>"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
+"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 editar y pulse dos veces sobre él."
+"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:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
+#: C/account-jabber.page:65(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."
 msgstr ""
-"Escriba el mensaje personalizado nuevo y pulse <key>Intro</key> para "
-"modificarlo."
+"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/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Para quitar un mensaje personalizado:"
+#: 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:118(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"<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 ""
-"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
-"que quiere quitar."
+"<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:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Pulse el botón <gui>Quitar</gui>."
+#: 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:133(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:140(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."
+#: C/accounts-window.page:35(page/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."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"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>."
+"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/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/send-file.page:50(p)
+#: 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\">-</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/prob-conn-neterror.page:42(p)
+#: 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/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/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/prev-conv.page:38(p)
+#: 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. 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/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Registrar una cuenta nueva"
 
-#: C/prev-conv.page:67(p)
+#: 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)
+#: 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)
+#: 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)
+#: 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:9(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:34(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:37(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:41(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:48(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:50(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:55(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:57(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/introduction.page:28(p)
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Visión general de la privacidad"
+
+#: 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."
@@ -1817,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."
@@ -1825,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."
@@ -1833,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."
@@ -1845,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."
@@ -1853,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."
@@ -1865,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 "
@@ -1875,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 "
@@ -1885,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>."
@@ -1899,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."
@@ -1907,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 "
@@ -1931,1481 +1931,1721 @@ 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/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Los comandos de IRC soportados."
 
-#: C/geolocation-privacy.page:36(p)
+#: 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/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/geolocation-privacy.page:44(p)
+#: 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/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/geolocation-privacy.page:49(p)
+#: 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/license.page:38(item/title)
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "<em>Atribucio�n</em>"
 
-#: C/favorite-rooms.page:107(p)
+#: 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/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Ver conversaciones anteriores"
 
-#: C/create-account.page:66(p)
+#: 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/audio-video.page:87(p)
+#: 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/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/audio-video.page:118(p)
+#: 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/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/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Enviar archivos"
 
-#: C/audio-call.page:71(p)
+#: 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\">+</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)
+#: 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/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioridad"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
+
+#: 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/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/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidores"
+#: 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"
@@ -3592,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/help/gl/gl.po b/help/gl/gl.po
index 9d3405ae6..179f84f55 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy gnome-2-28\n"
-"POT-Creation-Date: 2011-12-19 21:11+0000\n"
-"PO-Revision-Date: 2012-01-16 23:06+0100\n"
+"POT-Creation-Date: 2012-02-17 15:08+0000\n"
+"PO-Revision-Date: 2012-02-25 15:54+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,1814 +17,1773 @@ msgstr ""
 "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"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Fran Dieguez <frandieguez@gnome.org>, 2011-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)
+#| 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 "Comezar unha conversa de vi�deo con un dos seus contactos."
+#: C/index.page:7(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Mensaxaría da 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 "Mensaxaría da 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 "Comezar unha conversa de vi�deo"
-
-#: 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 features only works with certain types of "
-#| "accounts, and it requires the other person to have an application that "
-#| "supports video calls."
+#: 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 ""
-"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha "
-"conversa con vídeo con eles. Estas funcionalidades só funcionan en certos "
-"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
-"videochamadas."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo da mensaxari�a instanta�nea Empathy</media>Mensaxeiro da 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 a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videochamada</"
-"media> ao lado do nome do contacto ao que quere chamar e seleccione <gui "
-"style=\"menuitem\">Videochamada</gui>."
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Xestio�n da cona"
 
-#: 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 ""
-"Abrirase unha nova xanela. Cando a conexio�n se estabeleza vera� "
-"<placeholder-2/> na parte inferior da xanela, ao caro�n do tempo de conversa "
-"total."
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Xestio�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 rematar a conversa, prema sobre <placeholder-1/>"
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Conversas 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 trocar unha conversa de vi�deo nunha conversa de son, seleccione "
-"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Desactivar "
-"vi�deo</gui></guiseq>."
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Conversas de son e vi�deo"
 
-#: C/video-call.page:61(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Comezar unha conversa de vi�deo con un metacontacto."
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Accio�ns 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 a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito sobre "
-"un metacontacto."
+#: C/index.page:55(section/title) C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Problemas comu�ns."
 
-#: 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 o contacto co que desexe ter unha conversa e desde o menu� "
-"seleccione <gui style=\"menuitem\">Vi�deochamada</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 recoñecer se un contacto e� un <em>metacontacto</em>, mova o rato sobre "
-"o contacto na xanela <gui>Lista de contactos</gui> e deteñase sobre el un "
-"segundo: aparecera� unha pequena mensaxe emerxente que mostra o nu�mero de "
-"contactos que forman o 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 "Entendendo os diferentes estados e iconas de estado."
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Informacio�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 iconas"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Icona de dispoñi�bel"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Dispoñible"
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "Detalles da conta 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 o estado <em>Dispoñi�bel</em> cando esta� no seu computador e pode falar "
-"cos seus contactos. Vostede pode estabelecer unha mensaxe personalizada para "
-"este estado."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Icona de ocupado"
-
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Ocupado"
+"As contas de IRC requiren informacio�n diferente que outros tipos de contas. "
+"Para crear unha conta IRC debe especificar cando menos a rede IRC e o "
+"alcume. Esta pa�xina detalla a informacio�n que pode fornecer para unha conta "
+"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."
-msgstr "Use o estado <em>Ocupado</em> para dicirlle aos seus contactos"
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Icona de ausente"
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Vostede debe ter instalado o paquete <placeholder-1/> para usar o IRC en "
+"<placeholder-2/>."
 
-#: 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 "<gui>Network</gui>"
+msgstr "<gui>Rede</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 o estado <em>Ausente</em> cando non esta� no seu computador. "
-"<app>Empathy</app> automaticamente estabelecer o seu estado a Ausente se non "
-"usa o seu computador por un anaco, ou se o seu protector de pantalla esta� "
-"activado. Por omisio�n, <app>Empathy</app> non usa as notificacio�ns e sons "
-"cando esta� Ausente. Vostede pode estabelecer unha mensaxe personalizada para "
-"este estado."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Icona de desconectado"
+"IRC e� un sistema aberto que permite a� xente estar en diferentes redes IRC. "
+"Cada rede e� distinta e ten os seus propios usuarios e salas de chat. "
+"<app>Empathy</app> lista as redes ma�is populares na lista desprega�bel "
+"<gui>Rede</gui>. Ai�nda asi� engadir ma�is redes. Consulte embaixo a <link xref="
+"\"#networks\"/>."
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisi�bel"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Alcume</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 ""
-"Ao estabelecer o seu estado <em>Invisi�bel</em>, aparecera� como desconectado "
-"para os seus contactos. Ai�nda asi� vostede estara� conectado aos seus "
-"contactos e podera� ver os estados dos seus contactos e iniciar unha conversa "
-"con eles."
+"O seu alcume e� un nome u�nico na rede IRC. So� unha persoa nunha rede pode "
+"usar certo alcume. Se obte�n unha mensaxe que di� <link xref=\"prob-conn-name"
+"\" role=\"error-msg\"/> debera� cambiar o seu alcume."
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Desconectada"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Contrasinal</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 ""
-"Estabelecer o seu estado a <em>Desconectado</em> desconectaralle de todas as "
-"su�as contas."
-
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Compartir o escritorio cos seus 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"
+"Algu�ns servidores, particularmente aqueles en redes privadas, requiren un "
+"contrasinal para a conexio�n. Se esta� autorizado a usar a rede, os "
+"administradores da rede forneceranlle un contrasinal."
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Compartir o seu escritorio"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "Contrasinais 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 ""
-"E� posi�bel compartir o escritorio con algu�ns dos seus contactos. Pode usar "
-"esta funcionalidade para mostrarlle o seu escritorio aos seus contactos "
-"para, por exemplo, pedirlle axuda ou axudar aos seus contactos a solucionar "
-"un problema."
+"Nalgunhas redes pode rexistrar os alcumes con un servizo coñecido como "
+"«NickServ». <app>Empathy</app> non admite directamente contrasinais para "
+"alcumes. Nalgunhas redes, inclui�ndo a popular rede freenode, os contrasinais "
+"do servidor redireccio�nanse automaticamente a NickServ, permiti�ndolle usar "
+"este campo para identificarse con NickServ. Para obter ma�is informacio�n "
+"contacte a <link xref=\"irc-nick-password\"/>."
+
+#: C/account-irc.page:76(item/title)
+#| msgid "Real name"
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Nome real</gui>"
 
-#: C/share-desktop.page:42(p)
+#: 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 o seu escritorio, precisa ter un servidor VNC, que é o "
-"que fornece esta funcionalidade. Instale no seu sistema <app>Vino</app>, o "
-"servidor VNC de GNOME, para fornecer esta compatibilidade."
+"Pode fornecer o seu nome real ademais do seu alcume. Outros usuarios podera�n "
+"velo ao ver a su�a informacio�n."
 
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr "Desde a xanela <gui>Lista de contactos</gui> leve a cabo o seguinte:"
+#: C/account-irc.page:81(item/title)
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Mensaxe de saída</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 o contacto co que quere compartir o seu escritorio e seleccione "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir o meu escritorio</"
-"gui></guiseq>."
+"Cando se desconecta enviase unha mensaxe de sai�da todas as salas de conversa "
+"nas que esta� e a todos os usuarios cos que ten unha conversa privada. Use "
+"este campo para fornecer unha mensaxe personalizada."
 
-#: 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 ""
-"Prema co botón dereito sobre o nome do contacto que quere compartir o seu "
-"escritorio e seleccione <gui>Compartir o meu escritorio</gui>."
+#: C/account-irc.page:94(info/title)
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "Redes IRC"
 
-#: C/share-desktop.page:71(p)
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Redes"
+
+#: C/account-irc.page:99(section/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."
+"<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 ""
-"Enviarase un convite para ver o seu escritorio ao contacto que seleccionou. "
-"Para ver o seu escritorio, terá que aceptalo."
+"<app>Empathy</app> inclu�e unha lista de redes IRC populares. Se quere usar "
+"outra rede IRC pode engadila a� lista. Tame�n pode modificar e eliminar redes "
+"da lista."
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:104(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
+"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 ""
-"Pode desconectar o contacto do seu computador empregando o aplicativo de "
-"compartición de escritorio."
+"Para engadir unha rede a� lista prema <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Engadir</media>."
 
-#: C/share-desktop.page:82(p)
+#: C/account-irc.page:107(item/p)
 msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
+"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 ""
-"Para obter máis información sobre como usar o aplicativo de compartición de "
-"escritorio remoto conxulte a súa axuda."
+"Para modificar unha rede da lista seleccione a rede e prema <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Editar</media>."
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:110(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"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 ""
-"Cando comparte o seu escritorio con outros, e posi�bel que experimente unha "
-"ralentizacio�n de rendemento de sistema e unha baixa velocidade de Internet."
+"Para eliminar unha rede da lista seleccione e prema <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Eliminar</media>."
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:115(section/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 adding or modifying a network, you can enter the following information:"
 msgstr ""
-"Algúns dos seus contactos non poderán usar esta funcionalidade. É preciso "
-"ter a versión 2.28 ou superior do <app>Empathy</app> e un visor de "
-"escritorio remoto compatíbel instalado no seu sistema."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Engadir, editar e borrar un mensaxe persoal para o seu estado."
-
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+"Ao engadir ou modificar unha rede pode introducir a seguinte informacio�n:"
 
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+#: C/account-irc.page:121(item/p)
+msgid ""
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "Este e� o nome da rede como quere que apareza na lista de redes."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Estabelecer unha mensaxe personalizada"
+#: C/account-irc.page:125(item/title)
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Codificación 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 ""
-"En ocasio�ns pode querer usar unha mensaxe persoal para o seu escritorio, por "
-"exemplo, para facer saber aos seus contactos que non estara� dispoñi�bel por "
-"un peri�odo de tempo."
+"Isto especifica a codificacio�n de caracteres usada xeralmente nesta rede. "
+"Unha codificacio�n de caracteres e� unha forma especi�fica de gravar os "
+"caracteres internamente nun computador. Existen moitas configuracio�ns de "
+"caracteres e debe usar a mesma configuracio�n de caracteres que o resto de "
+"usuarios para poder ver as su�as mensaxes 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 ""
-"E� posi�bel estabelecer unha mensaxe personalizada baseada nos diferentes "
-"estados dispoñi�beis."
+"De forma predefinida <app>Empathy</app> usa UTF-8, unha codificacio�n de "
+"caracteres moderna que pode xestionar texto na maiori�a dos idiomas do mundo. "
+"Outra configuracio�n de caracteres comu�n para ingle�s e outros idiomas "
+"occidentais e� ISO-8859-1."
+
+#: C/account-irc.page:141(item/title)
+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 a xanela <gui>Lista de contactos</gui>, prema na lista desprega�bel na "
-"parte superior."
+"Unha rede IRC pode ter moitos servidores aos que se pode conectar. Cando "
+"esta� conectado a un servidor nunha rede en particular, pode comunicarse con "
+"todos os usuarios en todos os servidores desa rede. Pode engadir e quitar "
+"servidores para esa rede usando os boto�ns <gui>Engadir</gui> e "
+"<gui>Eliminar</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 un estado ao que quere engadir a mensaxe personalizada. Ten que "
-"seleccionar o identificado coa etiqueta <gui>Mensaxe personalizada</gui>."
+"Cando un servidor estea seleccionado prema o campo baixo <gui>Servidor</gui> "
+"ou <gui>Porto</gui> para editalo. De forma alternativa, use as frechas "
+"esquerda e dereita para dar o foco ao campo e prema a barra espazadora para "
+"comezar a editalo."
 
-#: 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 ""
-"Introduza a su�a mensaxe personalizada na caixa de texto da parte superior da "
-"xanela e prema <key>Intro</key> para estabelecer a mensaxe."
+"Seleccione a caixa de verificacio�n na columna <gui>SSL</gui> para cifrar "
+"toda a comunicacio�n co servidor. Note que isto non preve�n que outros "
+"usuarios na rede vexan o que escribe en salas de conversa pu�blicas."
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Opcio�ns avanzadas para contas Jabber e Google Talk."
+
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Detalles da conta Jabber"
+
+#: 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 ""
-"Se quere estabelecer a mensaxe personalizada como un favorito, garda�ndoo "
-"para usalo de novo, prema na pequena estrela a� dereita da caixa de texto "
-"onde escribiu a su�a mensaxe personalizada."
+"A maiori�a das contas Jabber, para conectarse, so� requiren un ID de inicio de "
+"sesio�n e un contrasinal. Para algunhas contas en certo tipo de redes, pode "
+"necesitar introducir informacio�n adicional na seccio�n <gui>Avanzadas</gui>. "
+"Xeralmente non necesita usar as opcio�ns avanzadas de embaixo. Consulte a "
+"<link xref=\"add-account\"/> para obter instrucio�ns xerais para engadir unha "
+"conta."
 
-#: 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 ""
-"Se non o fai a mensaxe personalizada non estara� dispoñi�bel a pro�xima vez que "
-"use <app>Empathy</app>. So� se gardara� durante a sesio�n actual."
+"Google Talk e� un tipo de conta Jabber. Estas instrucio�ns tame�n funcionan "
+"para contas de Google Talk."
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Editar, quitar e engadir unha mensaxe personalizada"
+#: C/account-jabber.page:45(item/title)
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Requi�rese cifrado (TLS/SSL)</gui>"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Editar a mensaxe personalizada"
+#: C/account-jabber.page:46(item/title)
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>Ignorar os erros de certificados SSL</gui>"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Para editar unha mensaxe personalizada:"
-
-#: 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."
-msgstr ""
-"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
-"que quere editar e prema du�as veces sobre el."
-
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify 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 ""
-"Escriba a mensaxe personalizada nova e prema <key>Intro</key> para "
-"modificalo."
-
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Para eliminar unha mensaxe personalizada:"
+"Sempre que sexa posi�bel, a comunicacio�n entre <app>Empathy</app> e o "
+"servidor Jabber esta� cifrada. Se a comunicacio�n cifrada non e� posi�bel, pode "
+"que as mensaxes se envi�en sen cifrar. Seleccione <gui>Require cifrado</gui> "
+"para evitar que <app>Empathy</app> se comunique co servidor Jabber cando non "
+"e� posi�bel cifrar a comunicacio�n."
 
-#: C/set-custom-status.page:118(p)
+#: C/account-jabber.page:52(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"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 ""
-"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
-"que quere editar."
+"Algu�ns servidores Jabber poden cifrar datos usando certificados non va�lidos "
+"ou usando certificados de autoridades descoñecidas. Se confi�a no servidor ao "
+"que se esta� conectando pode seleccionar <gui>Ignorar os erros de "
+"certificados SSL</gui> para permitir comunicacio�ns cifradas con certificados "
+"non va�lidos."
 
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Prema sobre o boto�n <placeholder-1/>"
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Recurso</gui>"
+
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioridade</gui>"
 
-#: C/set-custom-status.page:131(p)
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+"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 ""
-"Para engadir unha mensaxe personalizada nova, desde a seccio�n <gui>Engadir "
-"estado gardado</gui>."
+"Se ten mu�ltiples aplicativos (en equipos diferentes, por exemplo) conectados "
+"a� su�a conta ao mesmo tempo, pode configurar un recurso para identificar "
+"univocamente cada unha. De forma predefinida <app>Empathy</app> usara� "
+"<input>Telepathy</input> como recurso."
 
-#: C/set-custom-status.page:136(p)
+#: C/account-jabber.page:65(item/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
+"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 ""
-"Prema na lista desprega�bel para seleccionar o estado no que quere "
-"estabelecer unha mensaxe personalizada."
-
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Prema sobre a caixa de texto e escriba a nova mensaxe personalizada."
-
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "Prema <gui>Engadir</gui> para engadir unha mensaxe nova aos gardados."
+"Pode estabelecer a prioridade para especificar que aplicativo deberi�a "
+"recibir mensaxes entrantes dos seus contactos. As mensaxes novas enviaranse "
+"ao aplicativo coa prioridade ma�is alta."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Ao rematar, prema en <placeholder-/>"
+#: C/account-jabber.page:70(item/title)
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Ignorar as configuracio�ns do servidor</gui>"
 
-#: C/set-custom-status.page:163(p)
+#: C/account-jabber.page:71(item/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."
+"<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 ""
-"Cando edita ou engade unha mensaxe personalizada nova non se estabelece como "
-"a mensaxe de estado actual. Ten que seleccionalo na xanela <gui>Lista de "
-"contactos</gui>."
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Enviar unha mensaxe a un dos seus contactos."
-
-#: 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"
+"<app>Empathy</app> usara� a configuracio�n predeterminada para conectarse ao "
+"servidor Jabber en funcio�n do seu ID de inicio de sesio�n. Para algu�ns "
+"servidores Jabber precisara� introducir manualmente os axustes do servidor. O "
+"seu fornecedor de Jabber deberi�alle fornecer ditos axustes."
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Enviar unha mensaxe a algue�n"
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Engadir, modificar e borrar contas."
 
-#: 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 ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema du�as veces sobre o nome "
-"do contacto co que quere ter unha conversa."
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Xanela de contas"
 
-#: C/send-message.page:42(p)
+#: C/accounts-window.page:35(page/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."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"Abrirase unha nova xanela. Escriba a mensaxe na caixa na parte inferior da "
-"xanela e prema <placeholder-1/> para enviala."
+"A xanela <gui>Contas</gui> permi�telle engadir, modificar e eliminar contas."
 
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Enviar unha mensaxe a un metacontacto"
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Detalles da conta"
 
-#: C/send-message.page:58(p)
+#: C/accounts-window.page:44(section/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"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 ""
-"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
-"conversa e desde o menu� seleccione <gui style=\"menuitem\">Conversa</gui>."
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Enviar un ficheiro desde o seu computador a un dos seus contactos."
+"Para a maiori�a dos tipos de conta pode, simplemente, introducir un ID de "
+"inicio de sesio�n e un contrasinal. Pore�n, algu�ns tipos de conta poden "
+"requirir informacio�n adicional."
 
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Enviar ficheiros"
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Engadir unha nova conta en <app>Empathy</app>."
 
-#: 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 ""
-"Desde a xanela <gui>Lista de contactos</gui> leve a cabo unha das seguintes "
-"opcio�ns:"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Engadir unha nova conta"
 
-#: C/send-file.page:45(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
+"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 ""
-"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
-"conversa e seleccione <placeholder-1/>."
+"Pode engadir contas de mensaxari�a instanta�nea de calquera servizo admitido "
+"para comunicarse con todos os seus contactos no <app>Empathy</app>. Para "
+"algu�ns fornecedores de contas estes pasos permitiranlle rexistrar unha nova "
+"conta. Para obter ma�is informacio�n consulte a <link xref=\"create-account\"/"
+">."
 
-#: C/send-file.page:50(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 ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr ""
-"Prema sobre o contacto ao que quere enviar un ficheiro e elixa "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar ficheiro</gui></"
-"guiseq>."
-
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Seleccione o ficheiro para enviar e prema <gui>Enviar</gui>."
+"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Editar</"
+"gui><gui>Contas</gui></guiseq> ou prema <key>F4</key>."
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Aparecera� a xanela <gui>Transferencia de ficheiros</gui>."
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Prema <gui style=\"button\">+</gui>."
 
-#: C/send-file.page:66(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
 msgstr ""
-"Agarde a que o seu contacto acepte a transferencia de ficheiro e prema "
-"<gui>Deter</gui> para deter a transferencia."
+"Desde a lista desprega�bel <gui>Protocolo</gui>seleccione o tipo de conta que "
+"quere engadir."
 
-#: C/send-file.page:72(p)
+#: C/add-account.page:62(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"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 ""
-"Cano remate a transferencia e� posi�bel pechar a xanela <gui>Transferencia de "
-"ficheiro</gui>."
+"Se ai�nda non ten unha conta rexistrada seleccione <gui>Crear unha nova conta "
+"no servidor</gui>. Esta caracteri�stica non esta� dispoñi�bel para todos os "
+"tipos de contas e pode non funcionar con algu�ns fornecedores de contas. Para "
+"obter ma�is informacio�n consulte a <link xref=\"create-account\"/>."
 
-#: C/send-file.page:80(p)
+#: C/add-account.page:69(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."
+"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 ""
-"Se ten mu�ltiples transferencias finalizadas listas na xanela prema "
-"<gui>Limpar</gui> para baleirar a lista. Isto so� quitara� os ficheiros da "
-"lista e non os borrara� do computador."
+"Escriba a información requirida. Para a maioría das contas só precisa un ID "
+"de inicio de sesión e un contrasinal. Algunhas contas poden requirir "
+"información adicional. Para obter maís información consulte a <link xref="
+"\"accounts-window#details\"/>."
 
-#: 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 ""
-"So e� posi�bel enviar ficheiros ao usar os seguintes servizos: <em>Jabber</"
-"em>, <em>Google Talk</em> e <em>Personas pro�ximas</em>."
+#: 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 "Prema <gui style=\"button\">Aplicar</gui>."
 
-#: C/send-file.page:93(p)
+#: C/add-account.page:81(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 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 enviarlle un ficheiro a unha persoa debe estar conectado a Internet ou "
-"a� rede local."
+"Para cambiar o nome que identifica a conta na xanela <gui>Contas</gui>, "
+"seleccione a conta da lista a� esquerda e prema no nome ou a barra "
+"espaciadora. Edite o nome da conta e prema <key>Intro</key> cando remate."
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Entender a caracteri�stica de Persoas pro�ximas."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Engadir a algue�n a� lista de contactos."
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Que e� Persoas pro�ximas"
+#: 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/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "Gustari�ame ver isto explicado un pouco ma�is."
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Engadir a algue�n a� su�a lista de contactos."
 
-#: 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."
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
 msgstr ""
-"O servizo de Xente pro�xima e� un servizo de comunicacio�n sen servidores: non "
-"precisa conectarse e autenticarse contra un servidor central para poder "
-"usalo."
+"Seleccione<guiseq><gui>Conversa</gui><gui>Engadir contacto</gui></guiseq>."
 
-#: C/salut-protocol.page:45(p)
+#: C/add-contact.page:40(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>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 ""
-"Este tipo de sistemas de mensaxeri�a sen servidores esta� restrinxido a redes "
-"de a�rea local e non se necesita unha conexio�n activa con Internet."
+"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta que quere usar "
+"par conectar co seu contacto. O seu contacto debera� usar o mesmo servizo que "
+"a conta que estea seleccionando."
 
-#: C/salut-protocol.page:49(p)
+#: C/add-contact.page:45(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."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"A xente que usa o servizo dentro da mesma rede de a�rea local autodestruirase "
-"e sera� posi�bel enviarlles mensaxes e ficheiros ao igual que con outros "
-"servizos"
+"No campo <gui>Identificador</gui> introduza o ID de inicio de sesio�n do seu "
+"contacto, o seu nome en pantalla ou outro identificador axeitado para o tipo "
+"de servizo."
 
-#: C/salut-protocol.page:54(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 msgstr ""
-"Todas as redes modernas de a�rea local deberi�an poder admitir este tipo de "
-"servizos."
-
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Quitar completamente unha conta en <app>Empathy</app>."
-
-#: C/remove-account.page:34(title)
-msgid "Remove an account"
-msgstr "Eliminar unha conta"
+"No campo <gui>Alcume</gui>escriba o nome do seu contacto tal e como lle "
+"gustari�a que aparecese na su�a lista de contactos."
 
-#: 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."
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
-"Pode quitar completamente unha conta de <app>Empathy</app> se non quere "
-"seguir usa�ndoa. Se quere usar de novo a conta en <app>Empathy</app> no "
-"futuro, debera� engadir os detalles da conta de novo."
+"Prema <gui>Engadir</gui> para engadir a persoa a� su�a lista de contactos."
 
-#: 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/add-contact.page:61(note/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Editar</"
-"gui><gui>Contas</gui></guiseq> ou prema <key>F4</key>."
+"Par engadir unha nova persoa a� su�a lista de contactos necesita estar "
+"conectado a Internet e a� su�a conta."
 
-#: C/remove-account.page:47(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.
+#.
+#. 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 ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 msgstr ""
-"Seleccione a conta que desexa eliminar desde a lista de contas na parte "
-"esquerda da xanela."
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 
-#: C/remove-account.page:51(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
-msgid "Click <gui style=\"button\">-</gui>."
-msgstr "Prema <gui style=\"button\">-</gui>."
+#: C/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Chamar aos seus contactos a trave�s de Internet."
 
-#: C/remove-account.page:54(p)
+#: C/audio-call.page:27(page/title)
+msgid "Start an audio conversation"
+msgstr "Comezar unha conversa de son"
+
+#: C/audio-call.page:29(page/p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"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 ""
-"Mostrarase un dia�logo preguntando por unha confirmacio�n. Prema no boto�n "
-"<gui>Eliminar</gui> para quitar a conta permanentemente."
+"Pode chamar aos seus contactos e ter conversas de son con eles. Esta "
+"caracteri�stica so� funciona con certo tipo de contas e require que a outra "
+"persoa teña un aplicativo que admita chamadas de son."
 
-#: C/remove-account.page:60(p)
+#: C/audio-call.page:34(item/p)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
+"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 ""
-"Incluso despois de eliminar unha conta <app>Empathy</app> non borra o seu "
-"historial de conversas para esa conta."
+"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">chamada de "
+"vi�deo</media> ao lado do nome do contacto ao que quere chamar e seleccione "
+"<gui style=\"menuitem\">Chamada de son</gui>."
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#: C/audio-call.page:42(item/p) C/video-call.page:44(item/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 ""
-"Diagnosticar problemas comu�ns ao conectarse a un servizo de mensaxari�a "
-"instanta�nea."
-
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problemas ao conectarse a un servizo de mensaxari�a instanta�nea"
+"Abrirase unha nova xanela. Cando a conexio�n se estabeleza vera� "
+"<placeholder-2/> na parte inferior da xanela, ao caro�n do tempo de conversa "
+"total."
 
-#. 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-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 "Para rematar a conversa, prema sobre <placeholder-1/>"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: 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 ""
-"An error message which says “<gui>Network error</gui>� appears in the main "
-"window."
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
-"Aparecera� a mensaxe de erro «<gui>Erro de rede</gui>» na xanela principal."
-
-#: C/prob-conn-neterror.page:34(title)
-msgid "I get a message that says “Network error�"
-msgstr "Obteño unha mensaxe que mostra «Erro de rede»"
+"Para trocar unha conversa de son nunha conversa de vídeo, seleccione "
+"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Vi�deo "
+"activado</gui></guiseq>."
 
-#: C/prob-conn-neterror.page:37(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Comezar unha conversa de son con un metacontacto."
 
-#: C/prob-conn-neterror.page:38(p)
+#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:64(item/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."
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
-"Empathy xa non lle permite crear unha conta de IRC sen un alcume va�lido. "
-"Quitouse a ligazo�n da gui�a. Quitar o texto."
+"Desde a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito sobre "
+"un metacontacto."
 
-#: C/prob-conn-neterror.page:42(p)
+#: C/audio-call.page:71(item/p)
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Este tipo de mensaxe sucede cando <app>Empathy</app> non se pode comunicar "
-"co servizo de mensaxari�a instanta�nea por algunha razo�n."
+"Seleccione o contacto co que desexe ter unha conversa e desde o menu� "
+"seleccione <gui style=\"menuitem\">Audiochamada</gui>."
 
-#: C/prob-conn-neterror.page:46(p)
+#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/p)
 msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
+"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 ""
-"Este tipo de erro tame�n sucede cando intenta usar unha conta de IRC sen ter "
-"configurado o alcume"
+"Para recoñecer se un contacto e� un <em>metacontacto</em>, mova o rato sobre "
+"o contacto na xanela <gui>Lista de contactos</gui> e deteñase sobre el un "
+"segundo: aparecera� unha pequena mensaxe emerxente que mostra o nu�mero de "
+"contactos que forman o metacontacto."
 
-#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:44(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 ""
-"Make sure that you are connected to the Internet, or to a local area network."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 msgstr ""
-"Asegu�rese de que esta� conectado a Internet ou a unha rede de a�rea local."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 
-#: 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:8(info/desc)
 msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
-msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logotipo da mensaxari�a instanta�nea Empathy</media>Mensaxari�a instanta�nea "
-"Empathy"
+"Information on when it is possible to have an audio or video conversation."
+msgstr "Informacio�n sobre cando e� posi�bel ter unha conversa de vi�deo ou son."
 
-#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p)
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Compatibilidade de son e vi�deo"
+
+#: C/audio-video.page:34(page/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."
+"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 ""
-"Comprobe na seccio�n <placeholder-1/> que todos os detalles son correctos. "
-"Vostede podera� encontrar estes detalles no sitio web do seu servizo de "
-"mensaxeri�a."
+"So� pode ter conversas de son e vi�deo con contactos que estean usando un "
+"aplicativo que tame�n admita esta caracteri�stica. Cando os aplicativos dos "
+"seus contactos admitan conversas de son ou vi�deo podera� velo mediante unha "
+"icona xunto aos seus nomes, na lista de contactos:"
 
-#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p)
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Icona"
+
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Descricio�n"
+
+#: C/audio-video.page:57(td/p)
 #| msgid ""
-#| "Deselect the <gui>Enabled</gui>, and then select it again to try to "
-#| "reconnect to the service."
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"Switch the account off, and then switch it on to try to reconnect to the "
-"service."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
-"Deseleccione a conta, e selecciónea de novo para tentar reconectarse ao "
-"servizo."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icona para conversa de son </media>"
 
-#: C/prob-conn-neterror.page:87(title)
-msgid "Proxy support"
-msgstr "Compatibilidade de proxy"
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "O contacto pode ter conversas de son."
 
-#: C/prob-conn-neterror.page:88(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 ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"Polo momento <app>Empathy</app> non se pode configurar para que funcione cun "
-"proxy."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icona para conversa de vídeo </media>"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "\"Nome en uso\""
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "O contacto pode ter conversas de vi�deo."
 
-#: C/prob-conn-name.page:10(desc)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"An error message which says “<gui>Name in use</gui>� appears in the main "
-"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 ""
-"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
-"uso</gui>»"
-
-#: C/prob-conn-name.page:33(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»"
+"Para poder ter unha conversa de son debe ter unha tarxeta de son admitida "
+"polo sistema operativo e un micro�fono que funcione."
 
-#: C/prob-conn-name.page:35(p)
+#: C/audio-video.page:87(note/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."
+"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 erro sucede cando tenta conectarse a� su�a conta de IRC e esta� "
-"usando un alcume que xa esta� usando outra persoa nesa rede en particular."
+"Para poder ter unha conversa de vi�deo debe ter unha ca�mara web compati�bel "
+"polo sistema operativo e un micro�fono que funcione."
 
-#: C/prob-conn-name.page:51(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "Na caixa de texto <gui>Alcume</gui> escriba un alcume novo."
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Tipos de contas admitidas"
 
-#: C/prob-conn-name.page:56(p)
+#: C/audio-video.page:97(section/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\"/>."
+"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 ""
-"Se rexistrou ese alcume na rede que esta� usando, estabeleza o contrasinal "
-"para ese alcume. Para obter ma�is informacio�n consulte a <link xref=\"irc-"
-"nick-password\"/>."
+"So� pode ter conversas de son e vi�deo usando contas en certos servizos "
+"compati�beis. A seguinte ta�boa mostra se o son ou vi�deo esta�n admitidos para "
+"cada tipo de conta."
 
-#: C/prob-conn-auth.page:8(desc)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
+"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 ""
-"Aparece unha mensaxe de erro na xanela principal que mostra «<gui>Fallo de "
-"autenticacio�n</gui>»."
+"Os tipos de contas son fornecidos por engadidos. Pode que o seu sistema non "
+"teña dispoñi�bel todos os seguintes tipos, ou pode ter tipos non mostrados "
+"aqui�. As actualizacio�ns de engadidos pode facer posi�bel conversas de son ou "
+"vi�deo en tipos de contas que aqui� mo�stranse como non compati�beis."
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "Obteño unha mensaxe que di «Produciuse un fallo na autenticacio�n»"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Servizo"
 
-#: 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 erro produ�cese cando o seu servizo de mensaxari�a intanta�nea non "
-"lle esta� permitindo conectar porque por algunha razo�n non recoñece o seu "
-"nome de usuario ou contrasinal."
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Audio"
 
-#: 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 ""
-"Asegu�rese de que rexistrou unha conta co servizo ao que esta� tentando "
-"conectarse. Se non ten unha conta a maiori�a dos servizos non lle permitira�n "
-"que se conecte."
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "V_i�deo"
 
-#: 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 o seu nome de usuario e contrasinal de novo e asegu�rese de que son "
-"correctos."
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: 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 <placeholder-1/>, e seleccio�neo de novo para tentar "
-"reconectarse ao servizo."
+#: 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-acctdisabled.page:7(desc)
-msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
-msgstr ""
-"A conta de mensaxari�a instanta�nea que quere usar non esta� activada na lista "
-"de contas."
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Chat de Facebook"
 
-#: C/prob-conn-acctdisabled.page:34(title)
-msgid "My account is not enabled"
-msgstr "A miña conta non esta� activada"
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: 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 ""
-"Se a conta de mensaxari�a instanta�nea que quere usar non esta� activada na "
-"lista desprega�bel de contas, cando tenta iniciar unha conversa nova ou "
-"unirse a unha charla, pode que os detalles da su�a conta non sexa correctos."
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: 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 ""
-"Elixa <guiseq><gui>Editar</gui><gui>Contas</gui></guiseq> e seleccione a "
-"conta que non esta� funcionando."
+#: 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 "Si"
 
-#: C/prob-conn-acctdisabled.page:66(p)
-msgid "Check that the account is switched on."
-msgstr "Comprobe que a conta está activada."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Explorar ou buscar nas su�as mensaxes anteriores."
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prev-conv.page:36(title)
-msgid "View previous conversations"
-msgstr "Ver as conversas anteriores"
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: 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."
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
+
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
+
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
+
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Persoas pro�ximas"
+
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
+
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
+
+#: 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 ""
-"<app>Empathy</app> garda automaticamente todas as conversas de texto que ten "
-"cos seus contactos. Pode <link xref=\"#search\">buscar a trave�s de todas as "
-"su�as conversas anteriores</link> ou <link xref=\"#browse\">buscar conversas "
-"anteriores</link> por contacto e data."
+"Cambie o seu estado para avisar da su�a dispoñibilidade aos seus contactos."
 
-#: C/prev-conv.page:46(p)
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Cambiar o seu estado"
+
+#: C/change-status.page:41(page/p)
 msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
+"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 ""
-"Non necesita estar conectado a Internet para ver e buscar nas su�as conversas "
-"anteriores."
-
-#: C/prev-conv.page:53(title)
-msgid "Search previous conversations"
-msgstr "Buscar conversas anteriores"
+"Pode estabelecer o seu estado para indicar a su�a dispoñibilidade aos seus "
+"contactos <app>Empathy</app> permi�telle seleccionar unha lista de estados "
+"predefinidos."
 
-#: C/prev-conv.page:55(p)
+#: C/change-status.page:46(item/p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"Pode realizar unha busca de texto completo sobre todas as su�as conversas "
-"anteriores."
+"Prema na lista desprega�bel na parte superior da xanela da <gui>Lista de "
+"contactos</gui>."
 
-#: C/prev-conv.page:59(p) C/prev-conv.page:87(p)
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Seleccione o estado desde a lista."
+
+#: C/change-status.page:57(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"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 ""
-"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Ver</"
-"gui><gui>Conversas previas</gui></guiseq>. De forma alternativa prema "
-"<key>F3</key>."
+"Consulte a <link xref=\"status-icons\"/> para obter unha lista de estados "
+"predefinidos e o que significan. Tamén pode <link xref=\"set-custom-message"
+"\">engadir mensaxes de estado personalizados</link> para fornecerlle aos "
+"seus contactos maís información sobre a sú dispoñibilidade."
 
-#: 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."
+#: C/change-status.page:63(note/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."
+"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 ""
-"Seleccione unha conta desde a lista despregábel na parte superior. "
-"Mostrarase unha lista de contactos e salas de conversa para dita conta."
+"Se non usa o seu equipo durante un tempo ou se se activa o protector de "
+"pantallas, o estado cambiarase automaticamente a Ausente."
+
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Rexistre unha conta con un dos servizos de mensaxeri�a admitidos."
 
-#: C/prev-conv.page:67(p)
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Rexistrar unha nova conta"
+
+#: C/create-account.page:36(page/p)
 msgid ""
-"Type the text you want to search for in the <gui>Search</gui> text field."
-msgstr "Escriba o texto que quere buscar no campo de texto <gui>Buscar</gui>."
+"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 ""
+"Moitos tipos de conta requiren que cree unha conta cun fornecedor de contas "
+"antes de poder conectarse e usar aplicativos de mensaxari�a instanta�nea como "
+"<app>Empathy</app>. Con algu�ns fornecedores de contas pode usar "
+"<app>Empathy</app> para rexistrar una nova conta, usando os mesmos pasos que "
+"seguiri�a en <link xref=\"add-account\">engadir unha conta</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 ""
-"Mostrarase calquera conversa que coincida cos seus termos de busca. Por "
-"omisión, as conversas ordénanse por data."
+"Esta pa�xina fornece informacio�n sobre crear unha nova conta para varios "
+"tipos de conta. O seu fornecedor de contas deberi�a fornecerlle un ID de "
+"inicio de sesio�n e un contrasinal, asi� como outra informacio�n adicional que "
+"pode necesitar para conectarse con <app>Empathy</app>."
 
-#: C/prev-conv.page:80(title)
-msgid "Browse previous conversations"
-msgstr "Explorar as conversas 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 ""
-"Pode examinar por data as conversas previas cos seus contactos ou en salas "
-"de conversa."
+"Facebook e� unha das redes sociais ma�is usadas. Permite aos usuarios crear o "
+"seu propio perfil e comunicarse cos seus 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 unha conta desde a lista desprega�bel na parte superior esquerda. "
-"Mostrarase unha lista de contactos e salas de conversa para dita conta."
+"Para usar Facebook para comunicarse cos seus amigos necesita crear unha nova "
+"conta desde o 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 ""
-"Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
-"conversas. Por omisio�n mostrarase a conversa ma�is recente."
+"Jabber e� un sistema de mensaxari�a instanta�nea abeto. Como o correo "
+"electro�nico, Jabber permi�telle seleccionar o seu fornecedor de conta e "
+"comunicarse cos ouros usuarios de Jabber, independentemente do fornecedor da "
+"conta."
 
-#: 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 ""
-"Pode explorar as su�as conversas por data. Mostraranse os di�as nos que tipo "
-"unha conversa co contacto seleccionado en texto en negriña. Prema na data "
-"para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
-"datas ma�is cercanas."
+"Debera� crear unha nova conta con un fornecedor Jabber. Existen moitos "
+"fornecedores libres; un fornecedor popular e� <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 ""
-"Pode buscar dentro do texto das conversas escribindo no campo de texto de "
-"busca na parte superior. O texto coincidente resaltarase."
+"Se usa Google Mail ou Google Talk xa ten unha conta Jabber. Talk e� un "
+"servizo Jabber. Simplemente use o seu enderezo de Google Mail e o seu "
+"contrasinal 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 ""
-"Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
-"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
-"do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
-"Abrirase a xanela <gui>Conversas anteriores</gui> co contacto seleccionado."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Unir e separar diferentes contactos nun so�."
-
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Combinar e separar contactos"
+"Para usar esta caracteri�stica non precisa crear unha conta con un fornecedor "
+"de servizos. Este servizo funciona sempre que este� conectado a unha rede "
+"local, tal como un punto sen fi�os. Automaticamente encontra outros usuarios "
+"na rede que estean usando este servizo."
 
-#: 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 ""
-"Se un, ou ma�is, dos seus contactos ten mu�ltiples contas con diferentes "
-"servizos de mensaxari�a, pode combinar estes contactos nun u�nico."
+"Para obter ma�is informacio�n consulte a <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 ""
-"O contacto resultante cha�mase un <em>meta-contacto</em>: un contacto "
-"composto por diferentes contactos sinxelos."
+"SIP e� un sistema aberto que permite aos usuarios realizar conversas de son e "
+"vi�deo en Internet. Debe crear unha conta cun fornecedor SIP. Pode "
+"comunicarse con to�dolos usuarios SIP, independentemente do fornecedor 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 ""
-"Se ten un contacto Xoa�n Souto que esta� usando tres servizos de mensaxari�a "
-"como:"
-
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "xoan@facebook"
-
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "xoan.souto@gmail"
-
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "xoan_souto@hotmail"
-
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "Pode combinar estes contactos nun so� Xoa�n Souto"
-
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Combinar contactos"
+"Debido a algunhas diferencias te�cnicas, actualmente o servizo libre <link "
+"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> non "
+"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 a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito un dos "
-"contactos que ten diferentes contas, e seleccione <gui style=\"menuitem"
-"\">Ligar contactos...</gui>."
+"Algu�ns fornecedores SIP permi�tenlle chamar a tele�fonos normais desde o seu "
+"equipo. Xeralmente debera� subscribirse a un servizo de pago para usar esta "
+"caracteri�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 o panel lateral na xanela <gui>Contactos ligados</gui> seleccione os "
-"contactos que quere combinar."
-
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Prema <gui style=\"button\">Ligar</gui>."
+"Non necesita rexistrar unha conta para usar o IRC. Ai�nda que especifique un "
+"alcume ao engadir unha conta IRC en <app>Empathy</app>, este alcume so� se "
+"estabelece cada vez que se conecta. Se outro usuario esta� usando o nome, "
+"debera� elixir un alcume novo."
 
-#: 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 ""
-"Cando se cree un meta-contacto, o contacto predeterminado usarase para ter "
-"unha conversa con el ao premer du�as veces sobre el, este contacto tera� a "
-"presencia en liña ma�is alta."
-
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+"Algunhas redes IRC usan un servizo chamado NickServ para permitir aos "
+"usuarios protexer os seus alcumes. Para obter ma�is informacio�n consulte a "
+"<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 a <gui>Lista de contactos</gui>, prema co boto�n dereito para contactar "
-"con el de forma separada, e seleccione <gui style=\"menuitem\">Ligar "
-"contactos...</gui>."
-
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Prema <gui style=\"button\">Desligar</gui>."
-
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Informacio�n legal."
+"Algu�ns servidores de IRC esta�n protexidos con contrasinal. Necesitara� "
+"coñecer o contrasinal para conectarse a eses servidores. Xeralmente son "
+"redes de IRC privadas."
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Licenza"
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Servizos privativos"
 
-#: 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 traballo esta� licenciado baixo una Licenza Creative Commons Atribucio�n "
-"- Compartir igual 3.0 sen asistencia."
-
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "E� libre de:"
+"Existen moitos servizos privativos de mensaxari�a instanta�nea desenvolvidos "
+"por diferentes empresas e organizacio�ns, <app>Empathy</app> permi�telle "
+"conectarse a unha conta existente dos servizos ma�is populares. Para crear "
+"unha nova conta con un destes servizos, debe visitar a pa�xina web do servizo "
+"e aceptar os termos de uso."
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Compartir"
+#: 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:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Copiar, distribui�r e comunicar publicamente a obra"
+#: 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:29(em)
-msgid "To remix"
-msgstr "Facer obras derivadas"
+#: 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:30(p)
-msgid "To adapt the work."
-msgstr "Adaptar o traballo."
+#: 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:33(p)
-msgid "Under the following conditions:"
-msgstr "Baixo as seguintes condicio�ns:"
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Evitar que <app>Empathy</app> inicie sesio�n automaticamente na conta."
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Atribucio�n"
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Desactivar unha conta"
 
-#: C/license.page:39(p)
+#: C/disable-account.page:42(page/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)."
+"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 ""
-"Debe recoñecer os cre�ditos da obra da maneira especificada polo autor ou o "
-"licenciatario (pero non dunha maneira que suxira que ten o seu apoio ou "
-"apoian o uso que fai da su�a obra)."
-
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Compartir igual"
+"Pode desactivar unha conta para evitar que <app>Empathy</app> inicie sesio�n "
+"nela, sen ter que quitar a conta completamente. Pode querer desactivar unha "
+"conta e reactivala se so� quere iniciar sesio�n na conta de vez en cando, pero "
+"segue querendo usar <app>Empathy</app> para outras contas."
 
-#: C/license.page:47(p)
+#: C/disable-account.page:53(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."
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
 msgstr ""
-"Se modifica, transforma ou constru�e sobre este traballo debe distribui�r o "
-"traballo resultando baixo unha licenza igual, similar ou compati�bel."
+"Seleccione a conta que quere desactivar desde a lista de contas na parte "
+"esquerda da xanela."
 
-#: 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 ""
-"Pode encontrar o texto completo da licenza vexa o <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">sitio web de "
-"CreativeCommons</link>, ou lea o <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">Escrito de Commons</link> completo."
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Na parte dereita da xanela, desactíveo."
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Iniciar unha conversa con un contacto do IRC."
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Para reactivar a conta simplemente actíveo."
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Conversar con algue�n no IRC"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Configurar, unirse e xestionar salas favoritas."
 
-#: 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 ""
-"Pode manter conversas privadas con outros usuarios do IRC, fora das salas "
-"pu�blicas do IRC. Para iniciar unha conversa con outro usuario do IRC:"
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Salas favoritas"
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Estabelecer unha sala como favorita"
+
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Unirse a unha sala."
+
+#: C/favorite-rooms.page:40(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>."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
-"Na lista de contactos para a sala de chat do IRC, prema du�as veces no nome "
-"do usuario co que quere falar. De forma alternativa, prema co boto�n dereito "
-"sobre o nome de usuario e elixa <gui>Conversa</gui>."
+"Para obter ma�is informacio�n sobre como unirse a unha sala de chat IRC, "
+"consulte a <link xref=\"irc-join-room\"/>."
 
-#: C/irc-start-conversation.page:45(p)
+#: C/favorite-rooms.page:46(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=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"A lista de contactos da sala IRC non e� igual que a lista de contactos de "
-"<app>Empathy</app>. Conte�n unha lista de usuarios na sala de chat do IRC a� "
-"que se uniu. Salas diferentes poden ter diferentes listados de contactos."
+"Para obter ma�is informacio�n sobre como unirse a unha conversa en grupo, "
+"consulte a <link xref=\"group-conversations\"/>."
 
-#: C/irc-start-conversation.page:52(p)
+#: C/favorite-rooms.page:54(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>."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"A lista de contactos dunha sala de IRC xeralmente esta� na parte dereita da "
-"xanela da sala de IRC. Se non a ve elixa <guiseq><gui>Conversa</"
-"gui><gui>Mostrar a lista de contactos</gui></guiseq>."
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "Actualmente non e� posi�bel enviar ficheiros mediante o IRC."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Enviar ficheiros mediante o IRC"
+"Desde a xanela de conversa, elixa <guiseq><gui>Conversa</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 non e� posi�bel enviar ficheiros mediante o IRC."
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Unirse a�s salas favoritas"
 
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Protexa o seu alcume para previr que outros usuarios do IRC o 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 ""
+"Desde a xanela <gui>Lista de contactos</gui> leve a cabo unha das seguintes "
+"opcio�ns:"
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Usar un contrasinal para un alcume no IRC"
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Prema <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 ""
-"Nalgunhas redes IRC pode rexistrar o seu alcume con un servizo chamado "
-"NickServ. Enviando mensaxes especiais a NickServ pode configurar o seu "
-"contrasinal e identificarse. Pode que algunhas salas de conversa IRC non lle "
-"permitan unirse sen un nome rexistrado."
+"Seleccione <guiseq><gui>Salas</gui><gui>Unirse a�s favoritas</gui></guiseq> "
+"para unirse a todas as su�as salas favoritas."
+
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Seleccione a sala favorita que quere xestionar:"
 
-#: C/irc-nick-password.page:40(p)
+#: C/favorite-rooms.page:90(note/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."
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
-"Actualmente <app>Empathy</app> non e� compati�bel co rexistro de alcumes. "
-"Pore�n algu�ns servidores de IRC reenviara�n automaticamente un <em>contrasinal "
-"de servidor</em> a NickServ. Nesas redes podera� usar contrasinais de IRC en "
-"<app>Empathy</app> para identificarse contra NickServ. E� coñecido que a "
-"popular rede freenode dispo�n desta caracteri�stica."
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Para estabelecer un contrasinal de servidor de IRC:"
+"Para unirse a unha sala favorita debe estar conectado a Internet e coa conta."
 
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "Seleccione a conta de IRC da lista na parte esquerda do dia�logo."
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Xestionar as 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 ""
-"Na caixa de texto <gui>Contrasinal</gui> escriba o contrasinal que quere "
-"usar para rexistrar o seu alcume."
-
-#: 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 "Prema <gui style=\"button\">Aplicar</gui>."
+"Dese a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
+"gui><gui>Xestionar 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 instrucio�ns so� lle permiten usar un alcume protexido por contrasinal "
-"en certas redes IRC. Actualmente non e� posi�bel rexistrar un alcume IRC ou "
-"cambiar o seu contrasinal de alcume usando <placeholder-1/>."
+"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta da que quere "
+"xestionar as salas favoritas."
 
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Como usar IRC con <placeholder-1/>."
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Seleccione <placeholder-1/> para ver todas as su�as 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 a sala favorita que quere xestionar:"
 
-#: 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 ""
-"Vostede debe ter instalado o paquete <placeholder-1/> para usar o IRC en "
-"<placeholder-2/>."
+"Seleccione a caixa de verificacio�n <gui>Autoconectar</gui> para unirse a esa "
+"sala automaticamente ao conectarse coa conta."
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "Instalar telepathy-idle"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Prema <gui>Eliminar</gui> para elimianr a sala das su�as favoritas."
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Salas de chat e conversa no IRC."
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Cando remate prema <placeholder-1/>."
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Salas de char e conversas"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Usar e entender a xeolocalizaco�n en <app>Empathy</app>."
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Problemas comu�ns no IRC"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Posicio�n xeogra�fica"
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problemas comu�ns."
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Xeolocalizacio�n"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Entrar nunha canle IRC."
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Solucionar problemas comu�ns"
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Unirse a unha sala de conversa IRC"
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> non publica a miña posicio�n xeogra�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 ""
-"Pode unirse a salas de chat IRC (tame�n coñecidas como canles de IRC) en "
-"calquera rede de IRC a� que estea conectado. Para conectarse a unha rede de "
-"IRC consulte a <link xref=\"add-account\"/> e a <link xref=\"account-irc\"/>."
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Posicio�n xeogra�fica non 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 a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
-"gui><gui>Unirse</gui></guiseq>."
+"Se os contactos non poden ver a su�a posicio�n, <app>Empathy</app> pode non "
+"ser capaz de descubrir a su�a posicio�n xeogra�fica con unha boa marxe de "
+"precisio�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 a lista desprega�bel <gui>Conta</gui> elixa a conta IRC que corresponda "
-"coa rede que quere usar."
+"Neste caso non se publicara� a su�a posicio�n pero ai�nda asi� podera� ver a "
+"posicio�n dos seus 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 ""
-"Na caixa de texto <gui>Sala</gui>, escriba o nome da canle de IRC a� que "
-"quere unirse. Preceda o nome co cara�cter almohadilla (<sys>#</sys>)."
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Prema <gui>Unirse</gui> para entrar na sala."
+"Se quere publicar a su�a posicio�n xeogra�fica pode 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 os pasos anteriores para cada sala."
-
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Introduza o contrasinal para as salas de char IRC protexidas."
+"Para publicar a su�a localizacio�n xeogra�fica o seu servidor Jabber debe ser "
+"compati�bel co protocolo de eventos persoais (PEP). Mantense en liña unha "
+"lista dos <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep."
+"html\">servidores que admiten PEP</link>. Polo momento Google Talk non e� "
+"compati�bel con esta caracteri�stica."
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Unirse a unha sala de chat IRC protexida"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Que informacio�n se envi�a e a que�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 ""
-"Nalgunhas redes IRC as salas privadas de IRC poden estar protexidas por "
-"contrasinal. Se sabe o contrasinal, realice os seguintes pasos para unirse:"
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Privacidade na xeolocalizacio�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� sala</link> de forma normal."
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Que informacio�n se envi�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 preguntaralle o contrasinal. Introduza o contrasinal para a sala de "
-"conversa IRC e prema <gui style=\"button\">Unirse</gui>."
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "As ordes de IRC admitidas."
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Ordes IRC admitidas"
+"E� posi�bel enviar: o seu pai�s, rexio�n, localidade, a�rea, calle, edificio, "
+"planta, habitacio�n, co�digo postal, lonxitude e latitude, velocidade e "
+"orientacio�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 unha lista de ordes de IRC admitidos, nunha sala de conversa "
-"escriba <input>/help</input> e prema <key>Intro</key>."
+"A precisio�n e cantidade de informacio�n sobre a su�a posicio�n xeogra�fica "
+"basease no software ou na infraestrutura usada para descubrir a su�a posicio�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 as ordes dispoñi�beis teñen unha pequena descricio�n sobre o se uso."
+"Diferentes tipos de redes poden ter diferentes axustes de precisio�n e poden "
+"enviar informacio�n diferente. O uso de dispositivos externos tales como un "
+"GPS ou tele�fono mo�bil pode incrementar a precisio�n da informacio�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"
+"Cando o modo de privacidade esta� activo non se enviara� nada ma�is preciso que "
+"a su�a cidade, incluso se esta� usando un dispositivo externo."
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Introducio�n ao programa de mensaxari�a instanta�nea <app>Empathy</app>."
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Quen pode ver a informacio�n enviada"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Introduccio�n"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "So� os seus contactos poden ver a su�a posicio�n xeogra�fica."
 
-#: C/introduction.page:23(p)
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Que e� o modo de privacidade"
+
+#: 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> e� un aplicativo de mensaxari�a instanta�nea para o "
-"Escritorio GNOME. E� compati�bel con mensaxes de texto, chamas de voz e "
-"vi�deochamadas, transferencia de ficheiro e os sistemas de mensaxari�a ma�is "
-"populares como MSN e Google Talk."
+"O modo de privacidade, activado por omisio�n, e� un modo de precisio�n reducida "
+"da informacio�n de posicio�n xeogra�fica enviada aos seus contactos."
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Vista previa da privacidade"
 
-#: 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> inclu�e caracteri�sticas que lle axudara�n a colaborar "
-"mellor no traballo e permitiranlle manterse en contacto cos seus amigos de "
-"forma sinxela."
+"Visio�n xeral dos axustes de privacidade na xeolocalizacio�n de <app>Empathy</"
+"app>."
+
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "De forma predefinida a xeolocalizacio�n non esta� activada."
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "De forma predefinida o modo de privacidade esta� activado."
+
+#: 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> pode agrupar as conversas nunha u�nica xanela ou "
-"ter mu�ltiples xanelas para os diferentes tipos de conversas; busca sinxela "
-"das su�as conversas anteriores e comparticio�n do seu escritorio con un so� un "
-"par de clics de rato."
+"O modo de privacidade prevalece incluso cando se esta� usando dispositivos "
+"externos ma�is precisos."
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Xanela de <gui>Lista de contactos</gui>"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "So� os seus contactos poden ver a su�a posicio�n."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Xanela principal de <app>Empathy</app>"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Servizos que admiten xeolocalizacio�n e compatibilidade."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Xanela principal de <app>Empathy</app>."
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Servizos admitidos"
 
-#. 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 "Mensaxaría da Internet Empathy"
+"Polo momento a opcio�n de xeolocalizacio�n so�'e� compati�bel co servizo Jabber. "
+"Para poder usala, vostede e os seus contactos deben ter unha conta de 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 da mensaxari�a instanta�nea Empathy</media>Mensaxeiro da Internet "
-"Empathy"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Xestio�n da cona"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Xestio�n de contactos"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Conversas de texto"
+"Tame�n e� necesario que o servidor que esta� usando sexa compati�bel coa opcio�n "
+"de xeolocalizacio�n. A maiori�a dos servidores teñen compatibilidade. Vexa a "
+"pa�xina web de documentacio�n do seu servizo para obter ma�is informacio�n."
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Conversas de son e vi�deo"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Compatibilidade"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Accio�ns 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 ""
+"A caracteri�stica de xeolocalizacio�n de <app>Empathy</app> non e� compati�bel "
+"con outros servizos de posicio�n xeogra�fica tales como <em>Google Latitude</"
+"em>, <em>Yahoo Fire Eagle</em> ou <em>Brightkite</em>."
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Importar unha conta de outro aplicativo de mensaxari�a instanta�nea."
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Como activar e desactivar a xeolocalizacio�n en <placeholder-1/>."
 
-#: 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 e desactivar a xeolocalizacio�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 "Elixa <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Importar unha conta existente"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Seleccione o separador <gui>Localizacio�n</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 ""
-"A primeira vez que executa <app>Empathy</app> ofrecera�selle importar as su�as "
-"contas de outros aplicativos de mensaxari�a instanta�nea. Actualmente a u�nica "
-"aplicacio�n compati�bel e� <app>Pidgin</app>."
+"Seleccione <gui>Publicar a miña localizacio�n aos meus contactos</gui> para "
+"activar a xeolocalizacio�n."
 
-#: C/import-account.page:50(p)
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Para desactivar a xeolocalizacio�n, deseleccio�nea."
+
+#: 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 ""
-"Execute <app>Empathy</app> por primeira vez. Aparecera� un asistente que lle "
-"permitira� crear novas contas de distintos servizos."
+"Para aumentar a precisio�n da su�a posicio�n, deseleccione <gui>Reducir a "
+"precisio�n da localizacio�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>Si, importar os detalles da miña conta desde </gui>e prema "
-"en <gui>Seguinte</gui>."
+"Se ten un dispositivo externo como un GPS e quere enviar unha posicio�n ma�is "
+"exacta, seleccione a opcio�n axeitada na seccio�n <gui>Orixes das "
+"localizacio�ns</gui>."
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "Marque a caixa de verificacio�n xunto a cada conta que queira importar"
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Entender a xeolocalizacio�n."
 
-#: C/import-account.page:66(p)
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Que e� a xeolocalizacio�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 non e� posi�bel importar contas despois de ter completado o "
-"asistente de primeira execucio�n."
+"A xeolocalizacio�n permi�telle identificar a localizacio�n xeogra�fica real dun "
+"equipo ou un dispositivo conectado a Internet."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr ""
-"Ocultar os contactos desconectados da su�a <gui>Lista de contactos</gui>."
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Coa xeolocalizacio�n en <app>Empathy</app> vostede pode:"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Ocultar os contactos desconectados"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Publicar a su�a informacio�n xeogra�fica aos seus 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 ""
-"Normalmente <app>Empathy</app> mostra todos os contactos: os que esta�n "
-"conectados, cos que pode estabelecer unha conversa, e tame�n os que esta�n "
-"desconectados."
-
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Para agochar os contactos desconectados."
+"Vexa a localizacio�n xeogra�fica dos seus contactos e contacte con eles "
+"rapidamente."
 
-#: 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 a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Ver</"
-"gui><gui>Contactos desconectados</gui></guiseq> ou prema <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
+"Estabeleza a precisio�n da su�a localizacio�n e o dispositivo que usar para "
+"descubrir a su�a localizacio�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 os contactos desconectados de novo, repita o mesmo proceso."
+"Para poder ver as localizacio�ns xeogra�ficas dos seus contactos, estes deben "
+"usan un servizo e un aplicativo que admita a xeolocalizacio�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 ou unirse a un grupo de conversa cos seus contactos."
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Conversas 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."
@@ -1832,7 +1791,7 @@ msgstr ""
 "As conversas en grupo permi�tenlle manter conversas de texto con ma�is dun "
 "contacto ao mesmo tempo."
 
-#: 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."
@@ -1840,7 +1799,7 @@ msgstr ""
 "Para ter unha conversa en grupo debe ter rexistrado unha conta en Jabber ou "
 "Google Talk, ou en Persoas pro�ximas."
 
-#: 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."
@@ -1848,11 +1807,20 @@ msgstr ""
 "Pode ter conversas en grupo so� cos contactos que usan o mesmo servizo que o "
 "seu."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Iniciar unha conversa 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 a xanela <gui>Lista de contactos</gui> elixa <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."
@@ -1860,7 +1828,7 @@ msgstr ""
 "Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta que queira "
 "usar para a conversa 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."
@@ -1868,18 +1836,18 @@ msgstr ""
 "Na caixa de texto <gui>Servidor</gui> escriba o nome do servidor no que se "
 "hospedara� a conversa."
 
-#: 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 "De�ixeo baleiro se sera� no 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."
 msgstr ""
 "Na caixa de texto <gui>Sala</gui> escriba o nome que quere darlle a� conversa."
 
-#: 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 "
@@ -1889,7 +1857,7 @@ msgstr ""
 "publicamente dispoñi�bel para que outras persoas poidan unirse. Non e� posi�bel "
 "crear unha 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 "
@@ -1899,13 +1867,13 @@ msgstr ""
 "<gui>Lista de contactos</gui> seleccione o contacto que quere invitar e "
 "realice unha das seguintes accio�ns:"
 
-#: 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 ""
 "Prema co boto�n dereito do rato sobre o contacto e elixa <gui>Invitar a� sala "
 "de conversa</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>."
@@ -1913,7 +1881,7 @@ msgstr ""
 "Seleccione <guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Invitar a� sala "
 "de conversa</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."
@@ -1921,21 +1889,21 @@ msgstr ""
 "Se ten ma�is dunha conversa en grupo aberta seleccione na que quere invitar "
 "aos seus contactos."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Unirse a unha conversa 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 a seccio�n <gui>Lista de salas</gui> para ver todas as 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 "Prema du�as veces sobre o nome dunha sala a� que queira 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 "
@@ -1945,1485 +1913,1727 @@ msgstr ""
 "requirir un contrasinal ou poden ser de so� invitacio�n. <app>Empathy</app> "
 "non e� compati�bel este tipo de salas."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Entender a xeolocalizacio�n."
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Ocultar os contactos desconectados da su�a <gui>Lista de contactos</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Que e� a xeolocalizacio�n"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Ocultar os 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 ""
-"A xeolocalizacio�n permi�telle identificar a localizacio�n xeogra�fica real dun "
-"equipo ou un dispositivo conectado a Internet."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Coa xeolocalizacio�n en <app>Empathy</app> vostede pode:"
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Publicar a su�a informacio�n xeogra�fica aos seus contactos."
+"Normalmente <app>Empathy</app> mostra todos os contactos: os que esta�n "
+"conectados, cos que pode estabelecer unha conversa, e tame�n os que esta�n "
+"desconectados."
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr ""
-"Vexa a localizacio�n xeogra�fica dos seus contactos e contacte con eles "
-"rapidamente."
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "Para agochar os 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 ""
-"Estabeleza a precisio�n da su�a localizacio�n e o dispositivo que usar para "
-"descubrir a su�a localizacio�n."
+"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Ver</"
+"gui><gui>Contactos desconectados</gui></guiseq> ou prema <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 as localizacio�ns xeogra�ficas dos seus contactos, estes deben "
-"usan un servizo e un aplicativo que admita a xeolocalizacio�n."
+"Para mostrar os contactos desconectados de novo, repita o mesmo proceso."
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Como activar e desactivar a xeolocalizacio�n en <placeholder-1/>."
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Importar unha conta de outro aplicativo de mensaxari�a instanta�nea."
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activar e desactivar a xeolocalizacio�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 "Elixa <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Importar unha conta existente"
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Seleccione o separador <gui>Localizacio�n</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 ""
+"A primeira vez que executa <app>Empathy</app> ofrecera�selle importar as su�as "
+"contas de outros aplicativos de mensaxari�a instanta�nea. Actualmente a u�nica "
+"aplicacio�n compati�bel e� <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 a miña localizacio�n aos meus contactos</gui> para "
-"activar a xeolocalizacio�n."
+"Execute <app>Empathy</app> por primeira vez. Aparecera� un asistente que lle "
+"permitira� crear novas contas de distintos servizos."
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Para desactivar a xeolocalizacio�n, deseleccio�nea."
+#: 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>Si, importar os detalles da miña conta desde </gui>e prema "
+"en <gui>Seguinte</gui>."
+
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Marque a caixa de verificacio�n xunto a cada conta que queira 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 a precisio�n da su�a posicio�n, deseleccione <gui>Reducir a "
-"precisio�n da localizacio�n</gui>."
+"Actualmente non e� posi�bel importar contas despois de ter completado o "
+"asistente de primeira execucio�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 ""
-"Se ten un dispositivo externo como un GPS e quere enviar unha posicio�n ma�is "
-"exacta, seleccione a opcio�n axeitada na seccio�n <gui>Orixes das "
-"localizacio�ns</gui>."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Servizos que admiten xeolocalizacio�n e compatibilidade."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Introducio�n ao programa de mensaxari�a instanta�nea <app>Empathy</app>."
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Servizos admitidos"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Introduccio�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 ""
-"Polo momento a opcio�n de xeolocalizacio�n so�'e� compati�bel co servizo Jabber. "
-"Para poder usala, vostede e os seus contactos deben ter unha conta de Jabber."
+"<app>Empathy</app> e� un aplicativo de mensaxari�a instanta�nea para o "
+"Escritorio GNOME. E� compati�bel con mensaxes de texto, chamas de voz e "
+"vi�deochamadas, transferencia de ficheiro e os sistemas de mensaxari�a ma�is "
+"populares como MSN e 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 ""
-"Tame�n e� necesario que o servidor que esta� usando sexa compati�bel coa opcio�n "
-"de xeolocalizacio�n. A maiori�a dos servidores teñen compatibilidade. Vexa a "
-"pa�xina web de documentacio�n do seu servizo para obter ma�is informacio�n."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilidade"
+"<app>Empathy</app> inclu�e caracteri�sticas que lle axudara�n a colaborar "
+"mellor no traballo e permitiranlle manterse en contacto cos seus amigos de "
+"forma sinxela."
 
-#: 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 ""
-"A caracteri�stica de xeolocalizacio�n de <app>Empathy</app> non e� compati�bel "
-"con outros servizos de posicio�n xeogra�fica tales como <em>Google Latitude</"
-"em>, <em>Yahoo Fire Eagle</em> ou <em>Brightkite</em>."
+"Usando <app>Empathy</app> pode agrupar as conversas nunha u�nica xanela ou "
+"ter mu�ltiples xanelas para os diferentes tipos de conversas; busca sinxela "
+"das su�as conversas anteriores e comparticio�n do seu escritorio con un so� un "
+"par de clics de rato."
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Que informacio�n se envi�a e a que�n."
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Xanela de <gui>Lista de contactos</gui>"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Privacidade na xeolocalizacio�n"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Xanela principal de <app>Empathy</app>"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Que informacio�n se envi�a"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "Xanela principal de <app>Empathy</app>."
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "As ordes de IRC admitidas."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Ordes IRC admitidas"
+
+#: 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 ""
-"E� posi�bel enviar: o seu pai�s, rexio�n, localidade, a�rea, calle, edificio, "
-"planta, habitacio�n, co�digo postal, lonxitude e latitude, velocidade e "
-"orientacio�n."
+"Para ver unha lista de ordes de IRC admitidos, nunha sala de conversa "
+"escriba <input>/help</input> e prema <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 ""
-"A precisio�n e cantidade de informacio�n sobre a su�a posicio�n xeogra�fica "
-"basease no software ou na infraestrutura usada para descubrir a su�a posicio�n."
+"Todos as ordes dispoñi�beis teñen unha pequena descricio�n sobre o se uso."
 
-#: C/geolocation-privacy.page:44(p)
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Introduza o contrasinal para as salas de char IRC protexidas."
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Unirse a unha sala de chat IRC protexida"
+
+#: 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 poden ter diferentes axustes de precisio�n e poden "
-"enviar informacio�n diferente. O uso de dispositivos externos tales como un "
-"GPS ou tele�fono mo�bil pode incrementar a precisio�n da informacio�n enviada."
+"Nalgunhas redes IRC as salas privadas de IRC poden estar protexidas por "
+"contrasinal. Se sabe o contrasinal, realice os seguintes 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� 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 ""
-"Cando o modo de privacidade esta� activo non se enviara� nada ma�is preciso que "
-"a su�a cidade, incluso se esta� usando un dispositivo externo."
+"Empathy preguntaralle o contrasinal. Introduza o contrasinal para a sala de "
+"conversa IRC e prema <gui style=\"button\">Unirse</gui>."
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Quen pode ver a informacio�n enviada"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Entrar nunha canle IRC."
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "So� os seus contactos poden ver a su�a posicio�n xeogra�fica."
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Unirse a unha sala de conversa IRC"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Que e� o modo de privacidade"
+#: 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 ""
+"Pode unirse a salas de chat IRC (tame�n coñecidas como canles de IRC) en "
+"calquera rede de IRC a� que estea conectado. Para conectarse a unha rede de "
+"IRC consulte a <link xref=\"add-account\"/> e a <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 ""
-"O modo de privacidade, activado por omisio�n, e� un modo de precisio�n reducida "
-"da informacio�n de posicio�n xeogra�fica enviada aos seus contactos."
+"Desde a lista desprega�bel <gui>Conta</gui> elixa a conta IRC que corresponda "
+"coa rede que quere usar."
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Vista previa da privacidade"
+#: 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 ""
+"Na caixa de texto <gui>Sala</gui>, escriba o nome da canle de IRC a� que "
+"quere unirse. Preceda o nome co cara�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 "Prema <gui>Unirse</gui> para entrar na 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 ""
-"Visio�n xeral dos axustes de privacidade na xeolocalizacio�n de <app>Empathy</"
-"app>."
+"Para entrar en varias salas, debe repetir os pasos anteriores para cada sala."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "De forma predefinida a xeolocalizacio�n non esta� activada."
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Como usar IRC con <placeholder-1/>."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "De forma predefinida o modo de privacidade esta� activado."
+#: 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 ""
-"O modo de privacidade prevalece incluso cando se esta� usando dispositivos "
-"externos ma�is 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 "So� os seus contactos poden ver a su�a posicio�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 e conversas de IRC."
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> non publica a miña posicio�n xeogra�fica."
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Salas de char e conversas"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Posicio�n xeogra�fica non publicada"
+#: C/irc-manage.page:55(info/title)
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Problemas comu�ns no IRC"
+
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Protexa o seu alcume para previr que outros usuarios do IRC o usen."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Usar un contrasinal para un alcume no 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 ""
-"Se os contactos non poden ver a su�a posicio�n, <app>Empathy</app> pode non "
-"ser capaz de descubrir a su�a posicio�n xeogra�fica con unha boa marxe de "
-"precisio�n."
+"Nalgunhas redes IRC pode rexistrar o seu alcume con un servizo chamado "
+"NickServ. Enviando mensaxes especiais a NickServ pode configurar o seu "
+"contrasinal e identificarse. Pode que algunhas salas de conversa IRC non lle "
+"permitan unirse sen un nome rexistrado."
 
-#: 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 ""
-"Neste caso non se publicara� a su�a posicio�n pero ai�nda asi� podera� ver a "
-"posicio�n dos seus contactos."
+"Actualmente <app>Empathy</app> non e� compati�bel co rexistro de alcumes. "
+"Pore�n algu�ns servidores de IRC reenviara�n automaticamente un <em>contrasinal "
+"de servidor</em> a NickServ. Nesas redes podera� usar contrasinais de IRC en "
+"<app>Empathy</app> para identificarse contra NickServ. E� coñecido que a "
+"popular rede freenode dispo�n desta caracteri�stica."
+
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "Para estabelecer un contrasinal 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 "Seleccione a conta de IRC da lista na parte esquerda do dia�logo."
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-nick-password.page:57(item/p)
 msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
-"Se quere publicar a su�a posicio�n xeogra�fica pode intentar usar un "
-"dispositivo externo tal como un GPS."
+"Na caixa de texto <gui>Contrasinal</gui> escriba o contrasinal que quere "
+"usar para rexistrar o seu alcume."
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/irc-nick-password.page:69(note/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."
+"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 ""
-"Para publicar a su�a localizacio�n xeogra�fica o seu servidor Jabber debe ser "
-"compati�bel co protocolo de eventos persoais (PEP). Mantense en liña unha "
-"lista dos <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep."
-"html\">servidores que admiten PEP</link>. Polo momento Google Talk non e� "
-"compati�bel con esta caracteri�stica."
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Usar e entender a xeolocalizaco�n en <app>Empathy</app>."
-
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Posicio�n xeogra�fica"
+"Estas instrucio�ns so� lle permiten usar un alcume protexido por contrasinal "
+"en certas redes IRC. Actualmente non e� posi�bel rexistrar un alcume IRC ou "
+"cambiar o seu contrasinal de alcume usando <placeholder-1/>."
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Xeolocalizacio�n"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "Actualmente non e� posi�bel enviar ficheiros mediante o IRC."
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Solucionar problemas comu�ns"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Enviar ficheiros mediante o IRC"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Configurar, unirse e xestionar salas favoritas."
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Actualmente non e� posi�bel enviar ficheiros mediante o 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 unha conversa con un contacto do IRC."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Estabelecer unha sala como favorita"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Conversar con algue�n no IRC"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Unirse a unha 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 ""
+"Pode manter conversas privadas con outros usuarios do IRC, fora das salas "
+"pu�blicas do IRC. Para iniciar unha conversa con outro usuario do 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 obter ma�is informacio�n sobre como unirse a unha sala de chat IRC, "
-"consulte a <link xref=\"irc-join-room\"/>."
+"Na lista de contactos para a sala de chat do IRC, prema du�as veces no nome "
+"do usuario co que quere falar. De forma alternativa, prema co boto�n dereito "
+"sobre o nome de usuario e elixa <gui>Conversa</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 obter ma�is informacio�n sobre como unirse a unha conversa en grupo, "
-"consulte a <link xref=\"group-conversations\"/>."
+"A lista de contactos da sala IRC non e� igual que a lista de contactos de "
+"<app>Empathy</app>. Conte�n unha lista de usuarios na sala de chat do IRC a� "
+"que se uniu. Salas diferentes poden ter 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 a xanela de conversa, elixa <guiseq><gui>Conversa</gui><gui>Sala de "
-"chat favorita</gui></guiseq>."
+"A lista de contactos dunha sala de IRC xeralmente esta� na parte dereita da "
+"xanela da sala de IRC. Se non a ve elixa <guiseq><gui>Conversa</"
+"gui><gui>Mostrar a lista de contactos</gui></guiseq>."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Unirse a�s salas favoritas"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Informacio�n legal."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Prema <key>F5</key>."
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Licenza"
 
-#: 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 ""
-"Seleccione <guiseq><gui>Salas</gui><gui>Unirse a�s favoritas</gui></guiseq> "
-"para unirse a todas as su�as salas favoritas."
+"Este traballo esta� licenciado baixo una Licenza Creative Commons Atribucio�n "
+"- Compartir igual 3.0 sen asistencia."
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "Seleccione a sala favorita que quere xestionar:"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "E� libre de:"
+
+#: C/license.page:25(item/title)
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "<em>Compartir</em>"
 
-#: C/favorite-rooms.page:90(p)
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Copiar, distribui�r e comunicar publicamente a obra"
+
+#: C/license.page:29(item/title)
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "<em>Facer obras derivadas</em>"
+
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Adaptar o traballo."
+
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Baixo as seguintes condicio�ns:"
+
+#: C/license.page:38(item/title)
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "<em>Atribucio�n</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 ""
-"Para unirse a unha sala favorita debe estar conectado a Internet e coa conta."
+"Debe recoñecer os cre�ditos da obra da maneira especificada polo autor ou o "
+"licenciatario (pero non dunha maneira que suxira que ten o seu apoio ou "
+"apoian o uso que fai da su�a obra)."
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Xestionar as 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: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 ""
-"Dese a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
-"gui><gui>Xestionar salas favoritas</gui></guiseq>."
+"Se modifica, transforma ou constru�e sobre este traballo debe distribui�r o "
+"traballo resultando baixo unha licenza igual, similar ou compati�bel."
 
-#: 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 ""
-"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta da que quere "
-"xestionar as salas favoritas."
+"Pode encontrar o texto completo da licenza vexa o <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">sitio web de "
+"CreativeCommons</link>, ou lea o <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Escrito de Commons</link> completo."
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Seleccione <placeholder-1/> para ver todas as su�as salas favoritas."
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Unir e separar diferentes contactos nun so�."
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Seleccione a sala favorita que quere xestionar:"
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Combinar e separar contactos"
 
-#: 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 ""
-"Seleccione a caixa de verificacio�n <gui>Autoconectar</gui> para unirse a esa "
-"sala automaticamente ao conectarse coa conta."
-
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "Prema <gui>Eliminar</gui> para elimianr a sala das su�as favoritas."
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Cando remate prema <placeholder-1/>."
-
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "Evitar que <app>Empathy</app> inicie sesio�n automaticamente na conta."
-
-#: C/disable-account.page:40(title)
-msgid "Disable an account"
-msgstr "Desactivar unha conta"
+"Se un, ou ma�is, dos seus contactos ten mu�ltiples contas con diferentes "
+"servizos de mensaxari�a, pode combinar estes contactos nun u�nico."
 
-#: 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 ""
-"Pode desactivar unha conta para evitar que <app>Empathy</app> inicie sesio�n "
-"nela, sen ter que quitar a conta completamente. Pode querer desactivar unha "
-"conta e reactivala se so� quere iniciar sesio�n na conta de vez en cando, pero "
-"segue querendo usar <app>Empathy</app> para outras contas."
+"O contacto resultante cha�mase un <em>meta-contacto</em>: un contacto "
+"composto por diferentes contactos sinxelos."
 
-#: 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 a conta que quere desactivar desde a lista de contas na parte "
-"esquerda da xanela."
+"Se ten un contacto Xoa�n Souto que esta� usando tres servizos de mensaxari�a "
+"como:"
 
-#: C/disable-account.page:57(p)
-msgid "On the right side of the window, switch it off."
-msgstr "Na parte dereita da xanela, desactíveo."
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "xoan@facebook"
 
-#: C/disable-account.page:62(p)
-#| msgid ""
-#| "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-#| "gui>."
-msgid "To re-enable the account, switch it on."
-msgstr "Para reactivar a conta simplemente actíveo."
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "xoan.souto@gmail"
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Rexistre unha conta con un dos servizos de mensaxeri�a admitidos."
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "xoan_souto@hotmail"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Rexistrar unha nova conta"
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Pode combinar estes contactos nun so� Xoa�n Souto"
+
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Combinar contactos"
 
-#: C/create-account.page:36(p)
+#: 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 ""
-"Moitos tipos de conta requiren que cree unha conta cun fornecedor de contas "
-"antes de poder conectarse e usar aplicativos de mensaxari�a instanta�nea como "
-"<app>Empathy</app>. Con algu�ns fornecedores de contas pode usar "
-"<app>Empathy</app> para rexistrar una nova conta, usando os mesmos pasos que "
-"seguiri�a en <link xref=\"add-account\">engadir unha conta</link>."
+"Desde a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito un dos "
+"contactos que ten diferentes contas, e seleccione <gui style=\"menuitem"
+"\">Ligar 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 pa�xina fornece informacio�n sobre crear unha nova conta para varios "
-"tipos de conta. O seu fornecedor de contas deberi�a fornecerlle un ID de "
-"inicio de sesio�n e un contrasinal, asi� como outra informacio�n adicional que "
-"pode necesitar para conectarse con <app>Empathy</app>."
+"Desde o panel lateral na xanela <gui>Contactos ligados</gui> seleccione os "
+"contactos que quere 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 "Prema <gui style=\"button\">Ligar</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 e� unha das redes sociais ma�is usadas. Permite aos usuarios crear o "
-"seu propio perfil e comunicarse cos seus amigos."
+"Cando se cree un meta-contacto, o contacto predeterminado usarase para ter "
+"unha conversa con el ao premer du�as veces sobre el, este contacto tera� a "
+"presencia en liña ma�is alta."
+
+#: 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 cos seus amigos necesita crear unha nova "
-"conta desde o sitio web: <link href=\"http://www.facebook.com\">www.facebook."
-"com</link>."
+"Desde a <gui>Lista de contactos</gui>, prema co boto�n dereito para contactar "
+"con el de forma separada, e seleccione <gui style=\"menuitem\">Ligar "
+"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 "Prema <gui style=\"button\">Desligar</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 e� un sistema de mensaxari�a instanta�nea abeto. Como o correo "
-"electro�nico, Jabber permi�telle seleccionar o seu fornecedor de conta e "
-"comunicarse cos ouros usuarios de Jabber, independentemente do fornecedor da "
-"conta."
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Explorar ou buscar nas su�as mensaxes anteriores."
+
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Ver as conversas anteriores"
 
-#: C/create-account.page:66(p)
+#: 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 ""
-"Debera� crear unha nova conta con un fornecedor Jabber. Existen moitos "
-"fornecedores libres; un fornecedor popular e� <link href=\"http://register."
-"jabber.org/\">Jabber.org</link>."
+"<app>Empathy</app> garda automaticamente todas as conversas de texto que ten "
+"cos seus contactos. Pode <link xref=\"#search\">buscar a trave�s de todas as "
+"su�as conversas anteriores</link> ou <link xref=\"#browse\">buscar conversas "
+"anteriores</link> por contacto e data."
 
-#: 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 ""
-"Se usa Google Mail ou Google Talk xa ten unha conta Jabber. Talk e� un "
-"servizo Jabber. Simplemente use o seu enderezo de Google Mail e o seu "
-"contrasinal para conectarse."
+"Non necesita estar conectado a Internet para ver e buscar nas su�as conversas "
+"anteriores."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Persoas pro�ximas"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Buscar conversas 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 caracteri�stica non precisa crear unha conta con un fornecedor "
-"de servizos. Este servizo funciona sempre que este� conectado a unha rede "
-"local, tal como un punto sen fi�os. Automaticamente encontra outros usuarios "
-"na rede que estean usando este servizo."
+"Pode realizar unha busca de texto completo sobre todas as su�as conversas "
+"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 obter ma�is informacio�n consulte a <link xref=\"salut-protocol\"/>."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Ver</"
+"gui><gui>Conversas previas</gui></guiseq>. De forma alternativa prema "
+"<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 e� un sistema aberto que permite aos usuarios realizar conversas de son e "
-"vi�deo en Internet. Debe crear unha conta cun fornecedor SIP. Pode "
-"comunicarse con to�dolos usuarios SIP, independentemente do fornecedor SIP "
-"que usen."
+"Seleccione unha conta desde a lista despregábel na parte superior. "
+"Mostrarase unha lista de contactos e salas de conversa para dita conta."
 
-#: 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>."
-msgstr ""
-"Debido a algunhas diferencias te�cnicas, actualmente o servizo libre <link "
-"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> non "
-"funciona con <app>Empathy</app>."
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Escriba o texto que quere buscar no campo 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 ""
-"Algu�ns fornecedores SIP permi�tenlle chamar a tele�fonos normais desde o seu "
-"equipo. Xeralmente debera� subscribirse a un servizo de pago para usar esta "
-"caracteri�stica."
+"Mostrarase calquera conversa que coincida cos seus termos de busca. Por "
+"omisión, as conversas ordénanse por data."
 
-#: 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 "Explorar as conversas 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 ""
-"Non necesita rexistrar unha conta para usar o IRC. Ai�nda que especifique un "
-"alcume ao engadir unha conta IRC en <app>Empathy</app>, este alcume so� se "
-"estabelece cada vez que se conecta. Se outro usuario esta� usando o nome, "
-"debera� elixir un alcume novo."
+"Pode examinar por data as conversas previas cos seus contactos ou en salas "
+"de conversa."
 
-#: 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 ""
-"Algunhas redes IRC usan un servizo chamado NickServ para permitir aos "
-"usuarios protexer os seus alcumes. Para obter ma�is informacio�n consulte a "
-"<link xref=\"irc-nick-password\"/>."
+"Seleccione unha conta desde a lista desprega�bel na parte superior esquerda. "
+"Mostrarase unha lista de contactos e salas de conversa para dita conta."
 
-#: 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 ""
-"Algu�ns servidores de IRC esta�n protexidos con contrasinal. Necesitara� "
-"coñecer o contrasinal para conectarse a eses servidores. Xeralmente son "
-"redes de IRC privadas."
-
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Servizos privativos"
+"Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
+"conversas. Por omisio�n mostrarase a conversa ma�is recente."
 
-#: 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 moitos servizos privativos de mensaxari�a instanta�nea desenvolvidos "
-"por diferentes empresas e organizacio�ns, <app>Empathy</app> permi�telle "
-"conectarse a unha conta existente dos servizos ma�is populares. Para crear "
-"unha nova conta con un destes servizos, debe visitar a pa�xina web do servizo "
-"e aceptar os termos 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!"
+"Pode explorar as su�as conversas por data. Mostraranse os di�as nos que tipo "
+"unha conversa co contacto seleccionado en texto en negriña. Prema na data "
+"para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
+"datas ma�is cercanas."
 
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
+#: 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 ""
-"Cambie o seu estado para avisar da su�a dispoñibilidade aos seus contactos."
-
-#: C/change-status.page:39(title)
-msgid "Change your status"
-msgstr "Cambiar o seu estado"
+"Pode buscar dentro do texto das conversas escribindo no campo de texto de "
+"busca na parte superior. O texto coincidente resaltarase."
 
-#: 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 ""
-"Pode estabelecer o seu estado para indicar a su�a dispoñibilidade aos seus "
-"contactos <app>Empathy</app> permi�telle seleccionar unha lista de estados "
-"predefinidos."
+"Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
+"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
+"do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
+"Abrirase a xanela <gui>Conversas anteriores</gui> co 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 ""
-"Prema na lista desprega�bel na parte superior da xanela da <gui>Lista de "
-"contactos</gui>."
+"A conta de mensaxari�a instanta�nea que quere usar non esta� activada na lista "
+"de contas."
 
-#: C/change-status.page:51(p)
-msgid "Select a status from the list."
-msgstr "Seleccione o estado desde a lista."
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "A miña conta non esta� activada"
 
-#: C/change-status.page:57(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-message\">add custom "
-#| "status messages</link> to provide more information about your "
-#| "availability to your contacts."
+#: 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 a <link xref=\"status-icons\"/> para obter unha lista de estados "
-"predefinidos e o que significan. Tamén pode <link xref=\"set-custom-message"
-"\">engadir mensaxes de estado personalizados</link> para fornecerlle aos "
-"seus contactos maís información sobre a sú dispoñibilidade."
+"Se a conta de mensaxari�a instanta�nea que quere usar non esta� activada na "
+"lista desprega�bel de contas, cando tenta iniciar unha conversa nova ou "
+"unirse a unha charla, pode que os detalles da su�a conta non sexa 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 ""
-"Se non usa o seu equipo durante un tempo ou se se activa o protector de "
-"pantallas, o estado cambiarase automaticamente a Ausente."
+"Asegu�rese de que esta� conectado a Internet ou a unha rede de a�rea local."
 
-#. 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:49(item/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
 msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Elixa <guiseq><gui>Editar</gui><gui>Contas</gui></guiseq> e seleccione a "
+"conta que non esta� funcionando."
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
-msgstr "Informacio�n sobre cando e� posi�bel ter unha conversa de vi�deo ou son."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Compatibilidade de son e vi�deo"
+"Type your username and password again to make sure that they are correct."
+msgstr ""
+"Escriba o seu nome de usuario e contrasinal de novo e asegu�rese de que son "
+"correctos."
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(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:"
+"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 ""
-"So� pode ter conversas de son e vi�deo con contactos que estean usando un "
-"aplicativo que tame�n admita esta caracteri�stica. Cando os aplicativos dos "
-"seus contactos admitan conversas de son ou vi�deo podera� velo mediante unha "
-"icona xunto aos seus nomes, na lista de contactos:"
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Icona"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Descricio�n"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Icona para a conversa de son"
-
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "O contacto pode ter conversas de son."
-
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Icona para a conversa de vi�deo"
+"Comprobe na seccio�n <placeholder-1/> que todos os detalles son correctos. "
+"Vostede podera� encontrar estes detalles no sitio web do seu servizo de "
+"mensaxeri�a."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "O contacto pode ter conversas de vi�deo."
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Comprobe que a conta está activada."
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-auth.page:8(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>Authentication failed</gui>� appears in "
+"the main window."
 msgstr ""
-"Para poder ter unha conversa de son debe ter unha tarxeta de son admitida "
-"polo sistema operativo e un micro�fono que funcione."
+"Aparece unha mensaxe de erro na xanela principal que mostra «<gui>Fallo de "
+"autenticacio�n</gui>»."
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Obteño unha mensaxe que di «Produciuse un fallo na autenticacio�n»"
+
+#: C/prob-conn-auth.page:38(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 your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
 msgstr ""
-"Para poder ter unha conversa de vi�deo debe ter unha ca�mara web compati�bel "
-"polo sistema operativo e un micro�fono que funcione."
-
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Tipos de contas admitidas"
+"Este tipo de erro produ�cese cando o seu servizo de mensaxari�a intanta�nea non "
+"lle esta� permitindo conectar porque por algunha razo�n non recoñece o seu "
+"nome de usuario ou contrasinal."
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-auth.page:50(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."
+"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 ""
-"So� pode ter conversas de son e vi�deo usando contas en certos servizos "
-"compati�beis. A seguinte ta�boa mostra se o son ou vi�deo esta�n admitidos para "
-"cada tipo de conta."
+"Asegu�rese de que rexistrou unha conta co servizo ao que esta� tentando "
+"conectarse. Se non ten unha conta a maiori�a dos servizos non lle permitira�n "
+"que se conecte."
 
-#: C/audio-video.page:102(p)
+#: 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 ""
-"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."
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
 msgstr ""
-"Os tipos de contas son fornecidos por engadidos. Pode que o seu sistema non "
-"teña dispoñi�bel todos os seguintes tipos, ou pode ter tipos non mostrados "
-"aqui�. As actualizacio�ns de engadidos pode facer posi�bel conversas de son ou "
-"vi�deo en tipos de contas que aqui� mo�stranse como non compati�beis."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo da mensaxari�a instanta�nea Empathy</media>Mensaxari�a instanta�nea "
+"Empathy"
 
-#: C/audio-video.page:110(p)
+#: C/prob-conn-auth.page:68(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."
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
 msgstr ""
-"Gustariame poñer ta�boas como e�sta sen usar nada para Non e ✔ para Si�, pero "
-"de�bese tener en conta o impacto na accesibilidade. Xa <link href=\"http://"
-"mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
-"\">preguntei ao equipo de accesibilidade</link>."
+"Deseleccione <placeholder-1/>, e seleccio�neo de novo para tentar "
+"reconectarse ao servizo."
+
+#: C/prob-conn-name.page:9(info/title)
+#| msgid "“Name in use�"
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "«Nome en uso»"
 
-#: C/audio-video.page:118(p)
+#: C/prob-conn-name.page:10(info/desc)
 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."
+"An error message which says “<gui>Name in use</gui>� appears in the main "
+"window."
 msgstr ""
-"Existe traballo recente en telepathy-butterfly e papyon para admitir son e "
-"vi�deo para MSN. Pode que se publique a tempo para 2.28 pero xa non serve a "
-"planificacio�n de publicacio�ns de GNOME non se pode estar seguro. Se parece "
-"que vai dar tempo incluirase."
-
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Servizo"
+"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
+"uso</gui>»"
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Audio"
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»"
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "V_i�deo"
+#: 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 ""
+"Este tipo de erro sucede cando tenta conectarse a� su�a conta de IRC e esta� "
+"usando un alcume que xa esta� usando outra persoa nesa rede en particular."
 
-#: 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-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "Na caixa de texto <gui>Alcume</gui> escriba un alcume novo."
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Chat de Facebook"
+#: 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 ""
+"Se rexistrou ese alcume na rede que esta� usando, estabeleza o contrasinal "
+"para ese alcume. Para obter ma�is informacio�n consulte a <link xref=\"irc-"
+"nick-password\"/>."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+msgid ""
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
+msgstr ""
+"Deseleccione a conta, e selecciónea de novo para tentar reconectarse ao "
+"servizo."
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/prob-conn-neterror.page:7(info/desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
+msgstr ""
+"Aparecera� a mensaxe de erro «<gui>Erro de rede</gui>» na xanela principal."
 
-#: 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 "Si"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Obteño unha mensaxe que mostra «Erro de rede»"
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/prob-conn-neterror.page:42(page/p)
+msgid ""
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
+msgstr ""
+"Este tipo de mensaxe sucede cando <app>Empathy</app> non se pode comunicar "
+"co servizo de mensaxari�a instanta�nea por algunha razo�n."
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: 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 erro tame�n sucede cando intenta usar unha conta de IRC sen ter "
+"configurado o alcume"
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Compatibilidade de proxy"
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: 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 ""
+"Polo momento <app>Empathy</app> non se pode configurar para que funcione cun "
+"proxy."
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnosticar problemas comu�ns ao conectarse a un servizo de mensaxari�a "
+"instanta�nea."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemas ao conectarse a un servizo de mensaxari�a instanta�nea"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Chamar aos seus contactos a trave�s de Internet."
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Quitar completamente unha conta en <app>Empathy</app>."
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Comezar unha conversa de son"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Eliminar unha conta"
 
-#: C/audio-call.page:29(p)
+#: C/remove-account.page:36(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."
+"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 ""
-"Pode chamar aos seus contactos e ter conversas de son con eles. Esta "
-"caracteri�stica so� funciona con certo tipo de contas e require que a outra "
-"persoa teña un aplicativo que admita chamadas de son."
+"Pode quitar completamente unha conta de <app>Empathy</app> se non quere "
+"seguir usa�ndoa. Se quere usar de novo a conta en <app>Empathy</app> no "
+"futuro, debera� engadir os detalles da conta de novo."
 
-#: C/audio-call.page:34(p)
+#: C/remove-account.page:47(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>."
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
 msgstr ""
-"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">chamada de "
-"vi�deo</media> ao lado do nome do contacto ao que quere chamar e seleccione "
-"<gui style=\"menuitem\">Chamada de son</gui>."
+"Seleccione a conta que desexa eliminar desde a lista de contas na parte "
+"esquerda da xanela."
+
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Prema <gui style=\"button\">-</gui>."
 
-#: C/audio-call.page:55(p)
+#: C/remove-account.page:54(item/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>."
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
 msgstr ""
-"Para trocar unha conversa de vi�deo nunha conversa de son, seleccione "
-"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Vi�deo "
-"activado</gui></guiseq>."
-
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Comezar unha conversa de son con un metacontacto."
+"Mostrarase un dia�logo preguntando por unha confirmacio�n. Prema no boto�n "
+"<gui>Eliminar</gui> para quitar a conta permanentemente."
 
-#: C/audio-call.page:71(p)
+#: C/remove-account.page:60(note/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
 msgstr ""
-"Seleccione o contacto co que desexe ter unha conversa e desde o menu� "
-"seleccione <gui style=\"menuitem\">Audiochamada</gui>."
+"Incluso despois de eliminar unha conta <app>Empathy</app> non borra o seu "
+"historial de conversas para esa conta."
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Engadir a algue�n a� lista de contactos."
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Entender a caracteri�stica de Persoas pro�ximas."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Engadir a algue�n a� su�a lista de contactos."
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Que e� Persoas pro�ximas"
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+#: 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 ""
-"Seleccione<guiseq><gui>Conversa</gui><gui>Engadir contacto</gui></guiseq>."
+"O servizo de Xente pro�xima e� un servizo de comunicacio�n sen servidores: non "
+"precisa conectarse e autenticarse contra un servidor central para poder "
+"usalo."
 
-#: C/add-contact.page:40(p)
+#: C/salut-protocol.page:45(page/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."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta que quere usar "
-"par conectar co seu contacto. O seu contacto debera� usar o mesmo servizo que "
-"a conta que estea seleccionando."
+"Este tipo de sistemas de mensaxeri�a sen servidores esta� restrinxido a redes "
+"de a�rea local e non se necesita unha conexio�n activa con Internet."
 
-#: C/add-contact.page:45(p)
+#: C/salut-protocol.page:49(page/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."
+"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 ""
-"No campo <gui>Identificador</gui> introduza o ID de inicio de sesio�n do seu "
-"contacto, o seu nome en pantalla ou outro identificador axeitado para o tipo "
-"de servizo."
+"A xente que usa o servizo dentro da mesma rede de a�rea local autodestruirase "
+"e sera� posi�bel enviarlles mensaxes e ficheiros ao igual que con outros "
+"servizos"
 
-#: C/add-contact.page:49(p)
+#: C/salut-protocol.page:54(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."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"No campo <gui>Alcume</gui>escriba o nome do seu contacto tal e como lle "
-"gustari�a que aparecese na su�a lista de contactos."
+"Todas as redes modernas de a�rea local deberi�an poder admitir este tipo de "
+"servizos."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Enviar un ficheiro desde o seu computador a un dos seus contactos."
+
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Enviar ficheiros"
+
+#: C/send-file.page:45(item/p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Prema <gui>Engadir</gui> para engadir a persoa a� su�a lista de contactos."
+"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
+"conversa e seleccione <placeholder-1/>."
 
-#: C/add-contact.page:61(p)
+#: 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 ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"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 ""
-"Par engadir unha nova persoa a� su�a lista de contactos necesita estar "
-"conectado a Internet e a� su�a conta."
+"Prema sobre o contacto ao que quere enviar un ficheiro e elixa "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar ficheiro</gui></"
+"guiseq>."
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Engadir unha nova conta en <app>Empathy</app>."
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccione o ficheiro para enviar e prema <gui>Enviar</gui>."
 
-#: C/add-account.page:40(title)
-msgid "Add a new account"
-msgstr "Engadir unha nova conta"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Aparecera� a xanela <gui>Transferencia de ficheiros</gui>."
 
-#: C/add-account.page:42(p)
+#: C/send-file.page:66(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\"/>."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"Pode engadir contas de mensaxari�a instanta�nea de calquera servizo admitido "
-"para comunicarse con todos os seus contactos no <app>Empathy</app>. Para "
-"algu�ns fornecedores de contas estes pasos permitiranlle rexistrar unha nova "
-"conta. Para obter ma�is informacio�n consulte a <link xref=\"create-account\"/"
-">."
-
-#: C/add-account.page:53(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
-msgid "Click <gui style=\"button\">+</gui>."
-msgstr "Prema <gui style=\"button\">+</gui>."
+"Agarde a que o seu contacto acepte a transferencia de ficheiro e prema "
+"<gui>Deter</gui> para deter a transferencia."
 
-#: C/add-account.page:58(p)
+#: C/send-file.page:72(item/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
 msgstr ""
-"Desde a lista desprega�bel <gui>Protocolo</gui>seleccione o tipo de conta que "
-"quere engadir."
+"Cano remate a transferencia e� posi�bel pechar a xanela <gui>Transferencia de "
+"ficheiro</gui>."
 
-#: C/add-account.page:62(p)
+#: C/send-file.page:80(note/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."
+"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 ""
-"Se ai�nda non ten unha conta rexistrada seleccione <gui>Crear unha nova conta "
-"no servidor</gui>. Esta caracteri�stica non esta� dispoñi�bel para todos os "
-"tipos de contas e pode non funcionar con algu�ns fornecedores de contas. Para "
-"obter ma�is informacio�n consulte a <link xref=\"create-account\"/>."
+"Se ten mu�ltiples transferencias finalizadas listas na xanela prema "
+"<gui>Limpar</gui> para baleirar a lista. Isto so� quitara� os ficheiros da "
+"lista e non os borrara� do computador."
 
-#: 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-file.page:87(note/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."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"Escriba a información requirida. Para a maioría das contas só precisa un ID "
-"de inicio de sesión e un contrasinal. Algunhas contas poden requirir "
-"información adicional. Para obter maís información consulte a <link xref="
-"\"accounts-window#details\"/>."
+"So e� posi�bel enviar ficheiros ao usar os seguintes servizos: <em>Jabber</"
+"em>, <em>Google Talk</em> e <em>Personas pro�ximas</em>."
 
-#: C/add-account.page:81(p)
+#: C/send-file.page:93(note/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."
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
 msgstr ""
-"Para cambiar o nome que identifica a conta na xanela <gui>Contas</gui>, "
-"seleccione a conta da lista a� esquerda e prema no nome ou a barra "
-"espaciadora. Edite o nome da conta e prema <key>Intro</key> cando remate."
+"Para enviarlle un ficheiro a unha persoa debe estar conectado a Internet ou "
+"a� rede local."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Engadir, modificar e borrar contas."
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Enviar unha mensaxe a un dos seus contactos."
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Xanela de contas"
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Enviar unha mensaxe a algue�n"
 
-#: C/accounts-window.page:35(p)
+#: C/send-message.page:36(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr ""
-"A xanela <gui>Contas</gui> permi�telle engadir, modificar e eliminar contas."
+"Desde a xanela <gui>Lista de contactos</gui>, prema du�as veces sobre o nome "
+"do contacto co que quere ter unha conversa."
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Detalles da conta"
+#: 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 ""
+"Abrirase unha nova xanela. Escriba a mensaxe na caixa na parte inferior da "
+"xanela e prema <placeholder-1/> para enviala."
 
-#: C/accounts-window.page:44(p)
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Enviar unha mensaxe a un metacontacto"
+
+#: C/send-message.page:58(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."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"Para a maiori�a dos tipos de conta pode, simplemente, introducir un ID de "
-"inicio de sesio�n e un contrasinal. Pore�n, algu�ns tipos de conta poden "
-"requirir informacio�n adicional."
+"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
+"conversa e desde o menu� seleccione <gui style=\"menuitem\">Conversa</gui>."
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Opcio�ns avanzadas para contas Jabber e Google Talk."
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Engadir, editar e borrar un mensaxe persoal para o seu estado."
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Detalles da conta Jabber"
+#: 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 "Estabelecer unha mensaxe personalizada"
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:36(page/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\"/>."
+"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 ""
-"A maiori�a das contas Jabber, para conectarse, so� requiren un ID de inicio de "
-"sesio�n e un contrasinal. Para algunhas contas en certo tipo de redes, pode "
-"necesitar introducir informacio�n adicional na seccio�n <gui>Avanzadas</gui>. "
-"Xeralmente non necesita usar as opcio�ns avanzadas de embaixo. Consulte a "
-"<link xref=\"add-account\"/> para obter instrucio�ns xerais para engadir unha "
-"conta."
+"En ocasio�ns pode querer usar unha mensaxe persoal para o seu escritorio, por "
+"exemplo, para facer saber aos seus contactos que non estara� dispoñi�bel por "
+"un peri�odo de tempo."
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:40(page/p)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"It is possible to set a custom message based on the different statuses "
+"available."
 msgstr ""
-"Google Talk e� un tipo de conta Jabber. Estas instrucio�ns tame�n funcionan "
-"para contas de Google Talk."
+"E� posi�bel estabelecer unha mensaxe personalizada baseada nos diferentes "
+"estados dispoñi�beis."
 
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Requi�rese cifrado (TLS/SSL)"
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema na lista desprega�bel na "
+"parte superior."
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorar os erros de certificados SSL"
+#: C/set-custom-status.page:52(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>."
+msgstr ""
+"Seleccione un estado ao que quere engadir a mensaxe personalizada. Ten que "
+"seleccionar o identificado coa etiqueta <gui>Mensaxe personalizada</gui>."
 
-#: C/account-jabber.page:47(p)
+#: C/set-custom-status.page:58(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."
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"Sempre que sexa posi�bel, a comunicacio�n entre <app>Empathy</app> e o "
-"servidor Jabber esta� cifrada. Se a comunicacio�n cifrada non e� posi�bel, pode "
-"que as mensaxes se envi�en sen cifrar. Seleccione <gui>Require cifrado</gui> "
-"para evitar que <app>Empathy</app> se comunique co servidor Jabber cando non "
-"e� posi�bel cifrar a comunicacio�n."
+"Introduza a su�a mensaxe personalizada na caixa de texto da parte superior da "
+"xanela e prema <key>Intro</key> para estabelecer a mensaxe."
 
-#: C/account-jabber.page:52(p)
+#: 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 star on the right of the text box "
+#| "where you wrote your custom message."
 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 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 ""
-"Algu�ns servidores Jabber poden cifrar datos usando certificados non va�lidos "
-"ou usando certificados de autoridades descoñecidas. Se confi�a no servidor ao "
-"que se esta� conectando pode seleccionar <gui>Ignorar os erros de "
-"certificados SSL</gui> para permitir comunicacio�ns cifradas con certificados "
-"non va�lidos."
+"Se quere estabelecer a mensaxe personalizada como un favorito, garda�ndoo "
+"para usalo de novo, prema na pequena estrela a� dereita da caixa de texto "
+"onde escribiu a su�a mensaxe personalizada."
+
+#: C/set-custom-status.page:69(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."
+msgstr ""
+"Se non o fai a mensaxe personalizada non estara� dispoñi�bel a pro�xima vez que "
+"use <app>Empathy</app>. So� se gardara� durante a sesio�n actual."
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Recurso"
+#: C/set-custom-status.page:78(section/title)
+#| msgid "To remove a custom message:"
+msgid "Edit and remove a custom message"
+msgstr "Editar e quitar unha mensaxe personalizada"
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioridad"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Editar a mensaxe personalizada"
+
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Para editar unha mensaxe personalizada:"
 
-#: 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 ""
-"Se ten mu�ltiples aplicativos (en equipos diferentes, por exemplo) conectados "
-"a� su�a conta ao mesmo tempo, pode configurar un recurso para identificar "
-"univocamente cada unha. De forma predefinida <app>Empathy</app> usara� "
-"<input>Telepathy</input> como recurso."
+"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
+"que quere editar e prema du�as veces sobre el."
 
-#: 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 ""
-"Pode estabelecer a prioridade para especificar que aplicativo deberi�a "
-"recibir mensaxes entrantes dos seus contactos. As mensaxes novas enviaranse "
-"ao aplicativo coa prioridade ma�is alta."
+"Escriba a mensaxe personalizada nova e prema <key>Intro</key> para "
+"modificalo."
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Ignorar as configuracio�ns do servidor"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Para eliminar unha mensaxe personalizada:"
 
-#: 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> usara� a configuracio�n predeterminada para conectarse ao "
-"servidor Jabber en funcio�n do seu ID de inicio de sesio�n. Para algu�ns "
-"servidores Jabber precisara� introducir manualmente os axustes do servidor. O "
-"seu fornecedor de Jabber deberi�alle fornecer ditos axustes."
+"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
+"que quere editar."
 
-#. 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 "Prema sobre o boto�n <placeholder-1/>"
+
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Ao rematar, prema en <placeholder-/>"
 
-#. 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:140(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."
+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"
+"Cando edita unha mensaxe personalizada nova non se estabelece como a mensaxe "
+"de estado actual. Ten que seleccionalo na xanela <gui>Lista de contactos</"
+"gui>."
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Informacio�n adicional necesaria para conectarse a redes IRC."
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Compartir o escritorio cos seus contactos."
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Detalles da conta 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 o seu 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 ""
-"As contas de IRC requiren informacio�n diferente que outros tipos de contas. "
-"Para crear unha conta IRC debe especificar cando menos a rede IRC e o "
-"alcume. Esta pa�xina detalla a informacio�n que pode fornecer para unha conta "
-"de IRC."
-
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Rede"
+"E� posi�bel compartir o escritorio con algu�ns dos seus contactos. Pode usar "
+"esta funcionalidade para mostrarlle o seu escritorio aos seus contactos "
+"para, por exemplo, pedirlle axuda ou axudar aos seus contactos a solucionar "
+"un problema."
 
-#: 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 e� un sistema aberto que permite a� xente estar en diferentes redes IRC. "
-"Cada rede e� distinta e ten os seus propios usuarios e salas de chat. "
-"<app>Empathy</app> lista as redes ma�is populares na lista desprega�bel "
-"<gui>Rede</gui>. Ai�nda asi� engadir ma�is redes. Consulte embaixo a <link xref="
-"\"#networks\"/>."
+"Para poder compartir o seu escritorio, precisa ter un servidor VNC, que é o "
+"que fornece esta funcionalidade. Instale no seu sistema <app>Vino</app>, o "
+"servidor VNC de GNOME, para fornecer esta compatibilidade."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Alcume"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "Desde a xanela <gui>Lista de contactos</gui> leve a cabo o seguinte:"
 
-#: 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 ""
-"O seu alcume e� un nome u�nico na rede IRC. So� unha persoa nunha rede pode "
-"usar certo alcume. Se obte�n unha mensaxe que di� <link xref=\"prob-conn-name"
-"\" role=\"error-msg\"/> debera� cambiar o seu alcume."
+"Seleccione o contacto co que quere compartir o seu escritorio e seleccione "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir o meu escritorio</"
+"gui></guiseq>."
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Contrasinal"
+#: 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 ""
+"Prema co botón dereito sobre o nome do contacto que quere compartir o seu "
+"escritorio e seleccione <gui>Compartir o meu 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 ""
-"Algu�ns servidores, particularmente aqueles en redes privadas, requiren un "
-"contrasinal para a conexio�n. Se esta� autorizado a usar a rede, os "
-"administradores da rede forneceranlle un contrasinal."
+"Enviarase un convite para ver o seu escritorio ao contacto que seleccionou. "
+"Para ver o seu escritorio, terá que aceptalo."
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Contrasinais NickServ"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr ""
+"Pode desconectar o contacto do seu computador empregando o aplicativo 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 ""
-"Nalgunhas redes pode rexistrar os alcumes con un servizo coñecido como "
-"«NickServ». <app>Empathy</app> non admite directamente contrasinais para "
-"alcumes. Nalgunhas redes, inclui�ndo a popular rede freenode, os contrasinais "
-"do servidor redireccio�nanse automaticamente a NickServ, permiti�ndolle usar "
-"este campo para identificarse con NickServ. Para obter ma�is informacio�n "
-"contacte a <link xref=\"irc-nick-password\"/>."
+"Para obter máis información sobre como usar o aplicativo de compartición de "
+"escritorio remoto conxulte a súa axuda."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Nome 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 ""
+"Cando comparte o seu escritorio con outros, e posi�bel que experimente unha "
+"ralentizacio�n de rendemento de sistema e unha baixa velocidade 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 ""
-"Pode fornecer o seu nome real ademais do seu alcume. Outros usuarios podera�n "
-"velo ao ver a su�a informacio�n."
+"Algúns dos seus contactos non poderán usar esta funcionalidade. É preciso "
+"ter a versión 2.28 ou superior do <app>Empathy</app> e un visor de "
+"escritorio remoto compatíbel instalado no seu sistema."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Mensaxe de sai�da"
+#. 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 ""
-"Cando se desconecta enviase unha mensaxe de sai�da todas as salas de conversa "
-"nas que esta� e a todos os usuarios cos que ten unha conversa privada. Use "
-"este campo para fornecer unha mensaxe personalizada."
+"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 "Entendendo os diferentes estados e iconas 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 iconas"
 
-#: 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> inclu�e unha lista de redes IRC populares. Se quere usar "
-"outra rede IRC pode engadila a� lista. Tame�n pode modificar e eliminar redes "
-"da lista."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Icona "
+"de «dispoñíbel»</media> <gui>Dispoñíbel</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 engadir unha rede a� lista prema <media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Engadir</media>."
+"Use o estado <em>Dispoñi�bel</em> cando esta� no seu computador e pode falar "
+"cos seus contactos. Vostede pode estabelecer unha mensaxe personalizada 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 unha rede da lista seleccione a rede e prema <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\">Icona 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 "Use o estado <em>Ocupado</em> para dicirlle aos seus contactos"
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</"
+"media> <gui>Away</gui>"
 msgstr ""
-"Para eliminar unha rede da lista seleccione e prema <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
-"\"16\">Eliminar</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icona de "
+"«ausente»</media> <gui>Ausente</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 ""
-"Ao engadir ou modificar unha rede pode introducir a seguinte informacio�n:"
+"Use o estado <em>Ausente</em> cando non esta� no seu computador. "
+"<app>Empathy</app> automaticamente estabelecer o seu estado a Ausente se non "
+"usa o seu computador por un anaco, ou se o seu protector de pantalla esta� "
+"activado. Por omisio�n, <app>Empathy</app> non usa as notificacio�ns e sons "
+"cando esta� Ausente. Vostede pode estabelecer unha mensaxe personalizada para "
+"este estado."
 
-#: C/account-irc.page:121(p)
+#: 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 ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
-msgstr "Este e� o nome da rede como quere que apareza na lista de redes."
+"<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\">Icona "
+"de «desconectado»</media> <gui>Desconectado</gui>"
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Conxunto de caracteres"
+#: 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 ""
+"Ao estabelecer o seu estado <em>Invisi�bel</em>, aparecera� como desconectado "
+"para os seus contactos. Ai�nda asi� vostede estara� conectado aos seus "
+"contactos e podera� ver os estados dos seus contactos e iniciar unha conversa "
+"con eles."
 
-#: C/account-irc.page:126(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 ""
-"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 ""
-"Isto especifica a codificacio�n de caracteres usada xeralmente nesta rede. "
-"Unha codificacio�n de caracteres e� unha forma especi�fica de gravar os "
-"caracteres internamente nun computador. Existen moitas configuracio�ns de "
-"caracteres e debe usar a mesma configuracio�n de caracteres que o resto de "
-"usuarios para poder ver as su�as mensaxes correctamente."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icona "
+"de «desconectado»</media> <gui>Desconectado</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 ""
-"De forma predefinida <app>Empathy</app> usa UTF-8, unha codificacio�n de "
-"caracteres moderna que pode xestionar texto na maiori�a dos idiomas do mundo. "
-"Outra configuracio�n de caracteres comu�n para ingle�s e outros idiomas "
-"occidentais e� ISO-8859-1."
+"Estabelecer o seu estado a <em>Desconectado</em> desconectaralle de todas as "
+"su�as contas."
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidores"
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Comezar unha conversa de vi�deo con un dos seus contactos."
+
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "Comezar unha conversa de vi�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 ""
-"Unha rede IRC pode ter moitos servidores aos que se pode conectar. Cando "
-"esta� conectado a un servidor nunha rede en particular, pode comunicarse con "
-"todos os usuarios en todos os servidores desa rede. Pode engadir e quitar "
-"servidores para esa rede usando os boto�ns <gui>Engadir</gui> e "
-"<gui>Eliminar</gui>."
+"Se ten unha cámara web poderá facer chamadas aos seus contactos e ter unha "
+"conversa con vídeo con eles. Estas funcionalidades só funcionan en certos "
+"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
+"videochamadas."
 
-#: 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 ""
-"Cando un servidor estea seleccionado prema o campo baixo <gui>Servidor</gui> "
-"ou <gui>Porto</gui> para editalo. De forma alternativa, use as frechas "
-"esquerda e dereita para dar o foco ao campo e prema a barra espazadora para "
-"comezar a editalo."
+"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videochamada</"
+"media> ao lado do nome do contacto ao que quere chamar e seleccione <gui "
+"style=\"menuitem\">Videochamada</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 a caixa de verificacio�n na columna <gui>SSL</gui> para cifrar "
-"toda a comunicacio�n co servidor. Note que isto non preve�n que outros "
-"usuarios na rede vexan o que escribe en salas de conversa pu�blicas."
+"Para trocar unha conversa de vi�deo nunha conversa de son, seleccione "
+"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Desactivar "
+"vi�deo</gui></guiseq>."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-msgstr "Fran Dieguez <frandieguez@gnome.org>, 2011."
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Comezar unha conversa de vi�deo con un metacontacto."
+
+#: 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 o contacto co que desexe ter unha conversa e desde o menu� "
+"seleccione <gui style=\"menuitem\">Vi�deochamada</gui>."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "Icona de dispoñi�bel"
+
+#~ msgid "Available"
+#~ msgstr "Dispoñible"
+
+#~ msgid "Busy icon"
+#~ msgstr "Icona de ocupado"
+
+#~ msgid "Busy"
+#~ msgstr "Ocupado"
+
+#~ msgid "Away icon"
+#~ msgstr "Icona de ausente"
+
+#~ msgid "Away"
+#~ msgstr "Ausente"
+
+#~ msgid "Offline icon"
+#~ msgstr "Icona de desconectado"
+
+#~ msgid "Invisible"
+#~ msgstr "Invisi�bel"
+
+#~ msgid "Offline"
+#~ msgstr "Desconectada"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "Editar, quitar e engadir unha mensaxe personalizada"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr ""
+#~ "Para engadir unha mensaxe personalizada nova, desde a seccio�n "
+#~ "<gui>Engadir estado gardado</gui>."
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr ""
+#~ "Prema na lista desprega�bel para seleccionar o estado no que quere "
+#~ "estabelecer unha mensaxe personalizada."
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr ""
+#~ "Prema sobre a caixa de texto e escriba a nova mensaxe personalizada."
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr ""
+#~ "Prema <gui>Engadir</gui> para engadir unha mensaxe nova aos gardados."
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
+
+#~ msgid "I'd like to see this played up a bit more."
+#~ msgstr "Gustari�ame ver isto explicado un pouco ma�is."
+
+#~ 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 xa non lle permite crear unha conta de IRC sen un alcume va�lido. "
+#~ "Quitouse a ligazo�n da gui�a. Quitar o texto."
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "Instalar telepathy-idle"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "Icona para a conversa de son"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "Icona para a conversa de vi�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 ""
+#~ "Gustariame poñer ta�boas como e�sta sen usar nada para Non e ✔ para Si�, "
+#~ "pero de�bese tener en conta o impacto na accesibilidade. Xa <link href="
+#~ "\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006."
+#~ "html\">preguntei ao equipo de accesibilidade</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 traballo recente en telepathy-butterfly e papyon para admitir son "
+#~ "e vi�deo para MSN. Pode que se publique a tempo para 2.28 pero xa non "
+#~ "serve a planificacio�n de publicacio�ns de GNOME non se pode estar seguro. "
+#~ "Se parece que vai dar tempo incluirase."
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "Network"
+#~ msgstr "Rede"
+
+#~ msgid "Nickname"
+#~ msgstr "Alcume"
+
+#~ msgid "Password"
+#~ msgstr "Contrasinal"
+
+#~ msgid "Quit message"
+#~ msgstr "Mensaxe de sai�da"
+
+#~ msgid "Charset"
+#~ msgstr "Conxunto de caracteres"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
 
 #~ msgid "Click on <gui style=\"button\">Remove</gui>."
 #~ msgstr "Prema <gui style=\"button\">Quitar</gui>."
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 97f7fccfb..194c705ec 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2010, 2011. Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
 #
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2010, 2011.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-docs master\n"
-"POT-Creation-Date: 2011-09-08 06:13+0000\n"
-"PO-Revision-Date: 2011-09-21 13:13+0200\n"
+"POT-Creation-Date: 2012-02-17 15:08+0000\n"
+"PO-Revision-Date: 2012-03-06 15:34+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Magyar <gnome-hu-list at gnome dot org>\n"
 "MIME-Version: 1.0\n"
@@ -16,1841 +16,1794 @@ msgstr ""
 "X-Generator: Lokalize 1.0\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
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Kelemen Gábor <kelemeng at gnome dot hu>, 2010, 2011, 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)
+#| 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 "Videobeszélgetés kezdése egyik partnerével."
+#: C/index.page:7(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy üzenetküldő"
 
-#: 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:8(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy üzenetküldő"
+
+#: 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 "Videobeszélgetés kezdése"
-
-#: C/video-call.page:30(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 features 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 ""
-"Ha rendelkezik webkamerával, akkor felhívhatja partnereit, és "
-"videobeszélgetést folytathat velük. Ez a szolgáltatás csak bizonyos "
-"fióktípusokkal működik, és a másik félnek is rendelkeznie kell a videohívást "
-"támogató alkalmazással."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy üzenetküldő logója </media> Empathy üzenetküldő"
 
-#: C/video-call.page:37(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 ""
-"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
-"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
-"\">Videohívás</gui> menüpontot."
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Fiókkezelés"
 
-#: 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 ""
-"Egy új ablak nyílik meg. A kapcsolat létrejöttekor az ablak alján a "
-"<gui>Kapcsolódva</gui> felirat jelenik meg, a beszélgetés teljes idejével "
-"együtt."
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Partnerkezelés"
 
-#: 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 ""
-"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">Befejezés</"
-"gui> gombra."
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Szöveges csevegések"
 
-#: 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 ""
-"Videobeszélgetés hangbeszélgetéssé alakításához válassza a <guiseq><gui "
-"style=\"menu\">Videó</gui><gui style=\"menuitem\">Videó ki</gui></guiseq> "
-"menüpontot."
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Hang- és videocsevegések"
 
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Videobeszélgetés indítása metapartnerrel"
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Speciális műveletek"
 
-#: 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 ""
-"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a "
-"metapartnerre."
+#: C/index.page:55(section/title) C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Gyakori problémák"
 
-#: C/video-call.page:68(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 ""
-"Válassza ki a partnert, akivel beszélgetni szeretne, és a menüből válassza a "
-"<gui style=\"menuitem\">Videohívás</gui> lehetőséget."
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
 
-#: 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: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 ""
-"Annak eldöntéséhez, hogy egy partner <em>metapartner</em>-e, vigye "
-"egérmutatóját a partnerre a <gui>Partnerlista</gui> ablakban, és a megjelenő "
-"üzenet megadja a metapartnert alkotó partnerek számát."
+"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 "A különböző állapotok és állapotikonok ismertetése."
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "IRC-hálózatokhoz való csatlakozáshoz szükséges további információk"
 
-#: 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-fiók részletei"
 
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "�llapottípusok és ikonok"
+#: 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 ""
+"Az IRC-fiókok sok más fióktípustól eltérő információkat igényelnek. IRC-fiók "
+"létrehozásához meg kell adnia legalább az IRC-hálózatot és egy becenevet. Ez "
+"az oldal részletesen leírja az IRC-fiókhoz megadható információkat."
 
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Elérhető ikon"
+#: 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 ""
+"Az IRC protokoll <app>Empathyban</app> való használatához telepíteni kell a "
+"<sys>telepathy-idle</sys> csomagot."
 
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Elérhető"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr "<gui>Hálózat</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 ""
-"Az <em>Elérhető</em> állapottal jelezheti, hogy a számítógépénél van, és "
-"ráér partnereivel csevegni. Ehhez az állapothoz beállíthat egyéni üzenetet."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Elfoglalt ikon"
+"Az IRC egy nyílt rendszer, amely lehetővé teszi független IRC-hálózatok "
+"futtatását. Az egyes hálózatok egyediek, és saját felhasználókkal és "
+"csevegőszobákkal rendelkeznek. Az <app>Empathy</app> a <gui>Hálózat</gui> "
+"legördülő listában felsorolja a legnépszerűbb hálózatokat. Ezen kívül "
+"továbbiakat is felvehet. Részletekért lásd a <link xref=\"#networks\"/> "
+"részt lentebb."
 
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Elfoglalt"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Becenév</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 ""
-"Az <em>Elfoglalt</em> állapottal hozhatja partnerei tudomására, hogy éppen "
-"nem szeretne csevegni velük. Ennek ellenére felvehetik Önnel a kapcsolatot, "
-"ha valami igazán sürgős megbeszélnivalójuk van. Alapértelmezésben az "
-"<app>Empathy</app> értesítési buborékokat és hangokat használ, ha Ön "
-"elfoglalt. Ehhez az állapothoz beállíthat egyéni üzenetet."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Távol ikon"
+"Beceneve az Ön egyedi neve az IRC-hálózaton. A hálózaton csak egy személy "
+"rendelkezhet egy adott becenévvel. Ha az <link xref=\"prob-conn-name\" role="
+"\"error-msg\"/> hibaüzenetet kapja, akkor módosítania kell becenevét."
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Távol"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Jelszó</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 ""
-"A <em>Távol</em> állapotot akkor használja, ha eltávolodik számítógépétől. "
-"Az <app>Empathy</app> automatikusan Távolra állítja állapotát, ha egy ideig "
-"nem használja számítógépét, vagy a képernyővédő aktiválódik. "
-"Alapértelmezésben az <app>Empathy</app> nem használ értesítő buborékokat és "
-"hangokat, ha Ön távol van. Ehhez az állapothoz beállíthat egyéni üzenetet."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Kilépett ikon"
+"Egyes kiszolgálók, különösen a magánhálózatokon lévők, jelszót igényelnek a "
+"csatlakozáshoz. Ha jogosult a hálózat használatára, akkor a hálózat "
+"rendszergazdái megadják a jelszót."
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Láthatatlan"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "NickServ jelszavak"
 
-#: 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 ""
-"Amikor állapotát <em>Láthatatlanra</em> állítja, partnerei számára "
-"kilépettként jelenik meg. Fiókjaihoz ekkor is csatlakozni fog, láthatja "
-"partnerei állapotát, és társalgásokat indíthat velük."
+"Egyes hálózatokon a becenevek regisztrálhatók a NickServ néven ismert "
+"szolgáltatással. Az <app>Empathy</app> közvetlenül nem támogatja a becenevek "
+"jelszavait. Egyes hálózatokon, beleértve a népszerű FreeNode-ot, a "
+"kiszolgálójelszavak automatikusan továbbításra kerülnek a NickServnek, így "
+"ezen mező beállításával azonosíthatja magát a NickServ felé. További "
+"részletekért lásd a <link xref=\"irc-nick-password\"/> oldalt."
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Kilépett"
+#: C/account-irc.page:76(item/title)
+#| msgid "Real name"
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Valódi név</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 ""
-"�llapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
+"Beceneve mellett megadhatja valódi nevét is. Más felhasználók láthatják ezt "
+"az Ön információinak megjelenítésekor."
 
-#: C/share-desktop.page:7(desc)
-#| msgid "Share the desktop with your contacts."
-msgid "Show your desktop to your contacts."
-msgstr "Asztalának megmutatása partnereinek."
+#: C/account-irc.page:81(item/title)
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Kilépési üzenet</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 ""
+"Amikor kilép, egy kilépési üzenet kerül elküldésre minden csevegőszobába, "
+"amelyben jelen van, és minden felhasználónak, akivel éppen társalog. Ebben a "
+"mezőben megadhat egy egyéni kilépési üzenetet."
 
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+#: C/account-irc.page:94(info/title)
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "IRC-hálózatok"
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Asztal megosztása"
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Hálózatok"
 
-#: C/share-desktop.page:35(p)
-#| msgid ""
-#| "It is possible, with some of your contacts, to share your desktop with "
-#| "them, or to start using your contacts desktop. You can use this "
-#| "functionality to show your desktop to your contacts, to ask for help or "
-#| "to help your contacts resolve a problem."
+#: 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 ""
-"Egyes partnereivel megoszthatja asztalát, vagy elkezdheti használni az "
-"övéket. Ezt a funkciót asztala partnereinek való megmutatására használhatja, "
-"így például segítséget kérhet, vagy segíthet nekik megoldani egy problémát."
+"Az <app>Empathy</app> tartalmazza a népszerű IRC-hálózatok listáját. Ha "
+"másik IRC-hálózathoz szeretne csatlakozni, akkor hozzá kell adnia a "
+"listához. A hálózatokat módosíthatja is, és a listából is eltávolíthatja "
+"azokat."
 
-#: 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 ""
-"Asztalának megosztásához rendszerére telepítve kell lennie egy "
-"VNC-kiszolgálónak, amely támogatja ezt a szolgáltatást. A <app>Vino</app>, a "
-"GNOME VNC-kiszolgálója tartalmazza a szükséges támogatást."
-
-#: C/share-desktop.page:51(p)
-#| msgid ""
-#| "From the <gui>Contact List</gui> window, perform one of the following:"
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr "A <gui>Partnerlista</gui> ablakban tegye a következők egyikét:"
+"Hálózat listához adásához nyomja meg a <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Hozzáadás</media> "
+"gombot."
 
-#: 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>."
+#: C/account-irc.page:107(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 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 ""
-"Válassza ki a partnert, akivel meg szeretné osztani az asztalát, és válassza "
-"a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Az asztalom "
-"megosztása</gui></guiseq> menüpontot."
+"A módosításhoz válassza ki a hálózatot, és nyomja meg a <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16"
+"\">Szerkesztés</media> gombot."
 
-#: 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>."
+#: C/account-irc.page:110(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>."
+"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 ""
-"Kattintson a jobb egérgombbal a partner nevére, akivel meg szeretné osztani "
-"az asztalát, és válassza <gui>Az asztalom megosztása</gui> menüpontot."
+"Az eltávolításhoz válassza ki a hálózatot, és nyomja meg a <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">z Eltávolítás</media> gombot."
 
-#: C/share-desktop.page:71(p)
+#: C/account-irc.page:115(section/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."
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
-"A kiválasztott partner kap egy meghívást az asztala megjelenítésére. Az "
-"asztal megjelenítéséhez ezt a partnernek el kell fogadnia."
+"Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
+"meg:"
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:121(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
+"This is the name of the network as you want it to appear in the list of "
+"networks."
 msgstr ""
-"A partnerét az asztal megosztására használt alkalmazás segítségével "
-"választhatja le a számítógépéről."
+"Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
 
-#: C/share-desktop.page:82(p)
-#| msgid ""
-#| "For more information about how to use the remote desktop viewer "
-#| "application, refer to its help."
-msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr ""
-"A távoliasztal-megosztó alkalmazás használatával kapcsolatos további "
-"információkért nézze meg annak súgóját."
+#: C/account-irc.page:125(item/title)
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Karakterkészlet</gui>"
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"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 ""
-"Amikor megosztja asztalát, a rendszer teljesítményének romlását és az "
-"internetkapcsolat lassulását tapasztalhatja."
+"Itt megadhatja a hálózaton általában használt karakterkódolást. A "
+"karakterkódolás a karakterek egy adott, számítógépen belüli tárolási módja. "
+"Számos karakterkódolás van, és az üzenetek megfelelő megjelenítéséhez "
+"ugyanazt a karakterkódolást kell használnia, mint a többi felhasználó."
 
-#: C/share-desktop.page:96(p)
-#| msgid ""
-#| "Not all your contacts might be able to support this functionality. It is "
-#| "necessary for them to have at least the 2.28 version of <app>Empathy</"
-#| "app> and a remote desktop viewer application installed in their system."
+#: C/account-irc.page:135(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."
+"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 ""
-"Egyes partnerek lehet, hogy nem tudják ezt a szolgáltatást használni. Ehhez "
-"a "
-"rendszerükre az <app>Empathy</app> és egy kompatibilis "
-"távoliasztal-megjelenítő 2.28-as vagy újabb verziójának kell telepítve "
-"lennie."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Személyes állapotüzenetek hozzáadása, szerkesztése vagy törlése."
-
-#: 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"
+"Alapértelmezésben az <app>Empathy</app> az UTF-8-at használja, ez a modern "
+"karakterkódolás képes a világ sok nyelvének kezelésére, így a magyaréra is. "
+"A magyar nyelv gyakori kódolása még az ISO-8859-2."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Egyéni üzenet beállítása"
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Kiszolgálók</gui>"
 
-#: C/set-custom-status.page:36(p)
+#: C/account-irc.page:142(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."
+"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 ""
-"Egyes esetekben szüksége lehet egyéni állapotüzenet beállítására, például "
-"közölni ismerőseivel, hogy egy ideig nem lesz elérhető."
+"Az IRC-hálózat több kiszolgálóval rendelkezhet. Ha egy adott hálózat egy "
+"kiszolgálójához csatlakozik, a hálózat többi kiszolgálójához csatlakozó "
+"összes felhasználóval is képes kommunikálni. A hálózathoz a <gui>Hozzáadás</"
+"gui> gombbal vehet fel kiszolgálókat, és az <gui>Eltávolítás</gui> gombbal "
+"törölheti azokat."
 
-#: C/set-custom-status.page:40(p)
+#: C/account-irc.page:147(item/p)
 msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
+"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 ""
-"A különböző elérhető állapotok alapján lehetőség van egyéni üzenet "
-"beállítására."
+"Amikor egy kiszolgáló ki van választva, kattintson a <gui>Kiszolgáló</gui> "
+"vagy a <gui>Port</gui> alatti mezőre annak szerkesztéséhez. Ennek "
+"alternatívájaként a balra és jobbra nyilakkal is átviheti a fókuszt a mezők "
+"közt, és a szóköz megnyomásával szerkesztheti azokat."
 
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
+#: C/account-irc.page:151(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
+"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 ""
-"A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
+"Jelölje be az <gui>SSL</gui> oszlop alatti jelölőnégyzetet a kiszolgálóval "
+"történő összes kommunikáció titkosításához. Ne feledje, hogy ez nem "
+"akadályoz meg senkit a hálózaton a nyilvános csevegőszobákba írt szavai "
+"elolvasásában."
+
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Speciális beállítások Jabber és Google Talk fiókokhoz."
+
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Jabber fiókok részletei"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-jabber.page:31(page/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>."
+"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 ""
-"�llítsa be azt az állapotot, amelyhez az egyéni üzenetet meg kívánja adni. "
-"Az <gui>Egyéni üzenet</gui> címkével jelöltet válassza."
+"A legtöbb Jabber fiók csak bejelentkezési azonosítót és jelszót igényel a "
+"csatlakozáshoz. Egyes fiókokhoz, vagy bizonyos hálózattípusokon további "
+"információk megadására lehet szükség a <gui>Speciális</gui> szakaszban. "
+"�ltalában nincs szükség a lentebbi speciális beállítások használatára. Fiók "
+"hozzáadásával kapcsolatban lásd az <link xref=\"add-account\"/> oldalt."
 
-#: C/set-custom-status.page:58(p)
+#: C/account-jabber.page:39(note/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."
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
 msgstr ""
-"Adja meg egyéni üzenetét az ablak tetején lévő szövegdobozba, és nyomja meg "
-"az <key>Enter</key> billentyűt az üzenet beállításához."
+"A Google Talk a Jabber fiókok egy fajtája. Ezek az utasítások Google Talk "
+"fiókokra is érvényesek."
+
+#: C/account-jabber.page:45(item/title)
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Titkosítás szükséges (TLS/SSL)</gui>"
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:46(item/title)
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>SSL-tanúsítványhibák figyelmen kívül hagyása</gui>"
+
+#: C/account-jabber.page:47(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."
+"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 ""
-"Ha az egyéni üzenetet szeretné kedvencként beállítani, így elmentve az "
-"ismételt felhasználáshoz, akkor kattintson az egyéni üzenetet tartalmazó "
-"szövegdoboz jobb oldalán lévő csillagra."
+"Amikor csak lehetséges, az <app>Empathy</app> és a Jabber kiszolgáló közötti "
+"kommunikáció titkosított. Ha a titkosított kommunikáció nem lehetséges, az "
+"üzenetek titkosítatlanul kerülhetnek elküldésre. Válassza ki a "
+"<gui>Titkosítás szükséges</gui> négyzetet a Jabber kiszolgálóval való "
+"kommunikáció megtiltásához az <app>Empathynak</app>, ha a titkosítás nem "
+"lehetséges."
 
-#: C/set-custom-status.page:69(p)
+#: C/account-jabber.page:52(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."
+"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 ""
-"Ha ezt nem teszi meg, akkor az egyéni üzenet nem lesz elérhető az "
-"<app>Empathy</app> következő használatakor. Az üzenet alapértelmezésben csak "
-"az aktuális munkamenetben marad meg."
-
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Egyéni üzenet szerkesztése, eltávolítása és hozzáadása"
+"Egyes Jabber kiszolgálók az adatokat érvénytelen, vagy ismeretlen "
+"hitelesítésszolgáltatóktól származó tanúsítványokkal titkosíthatják. Ha "
+"megbízik a kiszolgálóban, amelyhez csatlakozik, akkor kiválaszthatja az "
+"<gui>SSL-tanúsítványhibák figyelmen kívül hagyása</gui> négyzetet az "
+"érvénytelen tanúsítvánnyal történő titkosított kommunikáció engedélyezéséhez."
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Válassza az <gui>Egyéni üzenetek szerkesztése</gui> lehetőséget."
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Erőforrás</gui>"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Egyéni üzenet szerkesztéséhez:"
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioritás</gui>"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
+"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 ""
-"A <gui>Mentett érték</gui> dobozból válassza ki a szerkeszteni kívánt "
-"állapotüzenetet, és kattintson rá duplán."
+"Ha több alkalmazással (például más számítógépekről) kapcsolódik egyidejűleg "
+"fiókjához, akkor beállíthat egy erőforrást ezek egyedi azonosításához. "
+"Alapértelmezésben az <app>Empathy</app> erőforrásként a <input>Telepathy</"
+"input> értéket használja."
 
-#: 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:65(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."
 msgstr ""
-"�rja be az új egyéni üzenetet, és nyomja meg az <key>Enter</key> billentyűt "
-"a módosításához."
+"Beállíthatja a prioritást annak megadásához, hogy melyik alkalmazás kapja "
+"partnereitől a bejövő üzeneteket. Az új üzenetek a legmagasabb prioritású "
+"alkalmazásnak kerülnek elküldésre."
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Egyéni üzenet eltávolításához:"
+#: C/account-jabber.page:70(item/title)
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Kiszolgáló beállításainak felülbírálása</gui>"
 
-#: C/set-custom-status.page:118(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"<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 ""
-"A <gui>Mentett érték</gui> dobozból válassza ki az eltávolítani kívánt "
-"állapotüzenetet."
+"Az <app>Empathy</app> az alapértelmezett beállításokat használja a Jabber "
+"kiszolgálóhoz való kapcsolódáshoz a bejelentkezési azonosítója alapján. "
+"Egyes Jabber kiszolgálókhoz saját kezűleg kell egyéni "
+"kiszolgálóbeállításokat megadnia. Ezeket a beállításokat a Jabber "
+"szolgáltatója biztosítja."
 
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Kattintson az <gui>Eltávolítás</gui> gombra."
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Fiókok hozzáadása, módosítása és törlése."
 
-#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr ""
-"Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Fiókok ablak"
 
-#: C/set-custom-status.page:136(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"Kattintson a legördülő listára azon állapot kiválasztásához, amelyhez új "
-"egyéni üzenetet kíván megadni."
+"A <gui>Fiókok</gui> ablak lehetővé teszi fiókok hozzáadását, módosítását és "
+"törlését."
 
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Kattintson a szövegdobozba, és írja be az új egyéni üzenetet."
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Fiók részletei"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#: 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 ""
-"Kattintson a <gui>Hozzáadás</gui> gombra az új üzenet felvételéhez a Mentett "
-"értékek közé."
+"A legtöbb fióktípushoz csak a bejelentkezési azonosítót és a jelszót kell "
+"megadnia. Bizonyos fiókok vagy fióktípusok azonban további információkat is "
+"igényelhetnek."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Ha elkészült, kattintson a <gui>Bezárás</gui> gombra."
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Új fiók felvétele az <app>Empathyba</app>."
 
-#: C/set-custom-status.page:163(p)
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Új fiók hozzáadása"
+
+#: C/add-account.page:42(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."
+"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 ""
-"Új egyéni üzenet szerkesztésekor vagy hozzáadásakor az nem kerül beállításra "
-"aktuális állapotüzenetként. Ehhez ki kell választania azt a "
-"<gui>Partnerlista</gui> ablakban."
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Üzenet küldése egyik partnerének."
+"Az <app>Empathyba</app> bármely támogatott szolgáltatás azonnaliüzenő-"
+"fiókjait felveheti, hogy kommunikálhasson partnereivel. Egyes szolgáltatók "
+"esetén ezekkel a lépésekkel egy új fiók regisztrálását is elvégezheti. "
+"További részletekért lásd az <link xref=\"create-account\"/> oldalt."
 
-#: 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)
-msgid "Phil Bull"
-msgstr "Phil Bull"
+#: 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 ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szerkesztés</"
+"gui><gui>Fiókok</gui></guiseq> menüpontot, vagy nyomja meg az <key>F4</key> "
+"billentyűt."
 
-#: 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-account.page:53(item/p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">+</gui> gombot."
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Üzenetek küldése"
+#: C/add-account.page:58(item/p)
+msgid ""
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr ""
+"A <gui>Protokoll</gui> legördülő listából válassza ki a felvenni kívánt fiók "
+"típusát."
 
-#: C/send-message.page:36(p)
+#: C/add-account.page:62(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."
+"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 ""
-"A <gui>Partnerlista</gui> ablakban kattintson duplán azon partner nevére, "
-"akivel csevegni szeretne."
+"Ha még nincs regisztrált fiókja, válassza az <gui>Új fiók létrehozása a "
+"kiszolgálón</gui> lehetőséget. Ez a szolgáltatás nem érhető el minden "
+"fióktípushoz, és egyes szolgáltatók esetén lehet hogy nem működik. További "
+"információkért lásd az <link xref=\"create-account\"/> oldalt."
 
-#: C/send-message.page:42(p)
+#: 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."
 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."
+"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 ""
-"Megnyílik egy új ablak. �rja be az üzenetet az ablak alján lévő "
-"szövegmezőbe, és nyomja meg az <key>Enter</key> billentyűt az elküldéséhez."
+"Adja meg a szükséges információkat. A legtöbb fiókhoz csak egy "
+"bejelentkezési azonosító és jelszó kell. Egyes fiókok további információkat "
+"igényelhetnek, lásd: <link xref=\"accounts-window#details\"/>."
 
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Üzenet küldése metapartnernek"
+#: 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 "Nyomja meg az <gui style=\"button\">Alkalmaz</gui> gombot."
 
-#: C/send-message.page:58(p)
+#: C/add-account.page:81(note/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"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 ""
-"Válassza ki a partnert, akivel csevegni szeretne, és a menüből válassza a "
-"<gui style=\"menuitem\">Csevegés</gui> pontot."
+"A fiókot a <gui>Fiókok</gui> ablakban azonosító név módosításához válassza "
+"ki a fiókot a bal oldali listából, és kattintson a nevére, vagy nyomja meg a "
+"szóköz billentyűt. Módosítsa a fiók nevét, és nyomja meg az <key>Enter</key> "
+"billentyűt ha befejezte."
 
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Fájl küldése a számítógépéről egy partnerének."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "A partnerlista bővítése."
 
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Fájlok küldése"
+#: 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:40(p) C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
-msgstr "A <gui>Partnerlista</gui> ablakban hajtsa végre a következők egyikét:"
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Egy személy felvétele a partnerlistájára"
 
-#: 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>."
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
 msgstr ""
-"Kattintson a jobb egérgombbal a partnerre, akinek fájlt szeretne küldeni, és "
-"válassza a <gui>Fájl küldése</gui> menüpontot."
+"Válassza a <guiseq><gui>Csevegés</gui><gui>Partner felvétele</gui></guiseq> "
+"menüpontot."
 
-#: C/send-file.page:50(p)
+#: C/add-contact.page:40(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>."
-msgstr ""
-"Kattintson a partnerre, akinek fájlt szeretne küldeni, majd válassza a "
-"<guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Fájl küldése</gui></"
-"guiseq> menüpontot."
-
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
+"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 ""
-"Válassza ki az elküldeni kívánt fájlt, és kattintson a <gui>Küldés</gui> "
-"gombra."
-
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Megjelenik a <gui>Fájlátvitelek</gui> ablak."
+"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki a "
+"csatlakozáshoz használandó fiókot. A partnerének az itt kiválasztott "
+"fiókéval egyező szolgáltatást kell használnia."
 
-#: C/send-file.page:66(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"Várjon, amíg partnere elfogadja a fájlátvitelt, vagy kattintson a "
-"<gui>Leállítás</gui> gombra az átvitel leállításához."
+"Az <gui>Azonosító</gui> mezőben adja meg partnere bejelentkezési "
+"azonosítóját, felhasználónevét, becenevét, vagy a szolgáltatástípushoz "
+"megfelelő egyéb azonosítóját."
 
-#: C/send-file.page:72(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 msgstr ""
-"Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
+"Az <gui>�lnév</gui> mezőben adja meg a partner nevét, ahogyan azt a "
+"partnerlistában szeretné látni."
 
-#: 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."
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
-"Ha az ablakban több befejeződött átvitel is fel van sorolva, akkor "
-"kattintson a <gui>Törlés</gui> gombra a lista kiürítéséhez. Ez a fájlokat "
-"csak a listából törli, a számítógépéről nem."
+"Kattintson a <gui>Hozzáadás</gui> gombra a személy felvételéhez a "
+"partnerlistájára."
 
-#: C/send-file.page:87(p)
+#: C/add-contact.page:61(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>."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"Fájlok küldése csak a következő szolgáltatások használatával lehetséges: "
-"<em>Jabber</em>, <em>Google Talk</em> és <em>Közeli emberek</em>."
+"Új személy partnerlistára való felvételéhez csatlakoznia kell az internethez "
+"és fiókjához."
 
-#: C/send-file.page:93(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.
+#.
+#. 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 ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 msgstr ""
-"Ahhoz, hogy valakinek fájlt tudjon küldeni, csatlakoznia kell az "
-"internethez, vagy helyi hálózathoz."
-
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "A Közeli emberek szolgáltatás bemutatása."
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Mi az a Közeli emberek?"
+#: C/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Hívja fel partnereit az interneten."
 
-#: 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:27(page/title)
+msgid "Start an audio conversation"
+msgstr "Hanghívás kezdeményezése"
 
-#: 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 ""
-"A Közeli emberek egy kiszolgáló nélküli kommunikációs szolgáltatás: "
-"használatához nincs szükség központi kiszolgálóhoz való csatlakozásra és "
-"bejelentkezésre."
+"Felhívhatja partnereit, és beszélgethet velük. Ez a szolgáltatás csak "
+"bizonyos fióktípusokkal működik, és a másik személynek is a hanghívásokat "
+"támogató alkalmazást kell használnia."
 
-#: 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 ""
-"Ez a fajta kiszolgáló nélküli üzenetküldő rendszer a helyi hálózatra van "
-"korlátozva, és használatához nincs szükség internetkapcsolatra."
+"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
+"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
+"\">Hanghívás</gui> lehetőséget."
 
-#: 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 ""
-"Az azonos helyi hálózaton ezt a szolgáltatást használó embereket a program "
-"automatikusan megtalálja, és ugyanúgy küldhet nekik üzeneteket és fájlokat, "
-"mint más szolgáltatások esetén."
+"Egy új ablak nyílik meg. A kapcsolat létrejöttekor az ablak alján a "
+"<gui>Kapcsolódva</gui> felirat jelenik meg, a beszélgetés teljes idejével "
+"együtt."
 
-#: 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 ""
-"Ezt a szolgáltatástípust minden korszerű helyi hálózatnak tudnia kell "
-"támogatni."
-
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Fiók teljes eltávolítása az <app>Empathyból</app>."
-
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "Fiók eltávolítása"
+"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">Befejezés</"
+"gui> gombra."
 
-#: C/remove-account.page:35(p)
+#: 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 ""
-"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."
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
-"Ha egy fiókot már nem kíván használni, teljesen eltávolíthatja azt az "
-"<app>Empathyból</app>. Ha a fiókot később újra használni szeretné az "
-"<app>Empathyban</app>, akkor újra meg kell adnia a fiók részleteit."
+"Hanghívás videohívássá változtatásához válassza a <guiseq><gui style=\"menu"
+"\">Videó</gui><gui style=\"menuitem\">Videó be</gui></guiseq> menüpontot."
 
-#: 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)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
-msgstr ""
-"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szerkesztés</"
-"gui><gui>Fiókok</gui></guiseq> menüpontot, vagy nyomja meg az <key>F4</key> "
-"billentyűt."
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Hanghívás indítása metapartnerrel"
 
-#: C/remove-account.page:46(p)
+#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:64(item/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
-"Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
-
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Kattintson az <gui style=\"button\">Eltávolítás</gui> gombra."
+"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a "
+"metapartnerre."
 
-#: C/remove-account.page:53(p)
+#: C/audio-call.page:71(item/p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Megjelenik egy megerősítést kérő ablak. Kattintson az <gui>Eltávolítás</gui> "
-"gombra a fiók végleges eltávolításához."
+"Válassza ki a felhívni kívánt partnert, majd a menüből a <gui style="
+"\"menuitem\">Hanghívás</gui> menüpontot."
 
-#: C/remove-account.page:59(p)
+#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/p)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
+"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 ""
-"Az <app>Empathy</app> még a fiók eltávolítása után sem törli a fiókhoz "
-"tartozó csevegéselőzményeket."
+"Annak eldöntéséhez, hogy egy partner <em>metapartner</em>-e, vigye "
+"egérmutatóját a partnerre a <gui>Partnerlista</gui> ablakban, és a megjelenő "
+"üzenet megadja a metapartnert alkotó partnerek számát."
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#. 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 ""
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 msgstr ""
-"Üzenetküldő-szolgáltatásokhoz való kapcsolódás általános problémáinak "
-"felismerése."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Azonnaliüzenet-küldő szolgáltatásokhoz kapcsolódás problémái"
+#: C/audio-video.page:8(info/desc)
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
+msgstr "Információk arról, hogy mikor kezdhet hang- vagy videohívást."
 
-#. 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 "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Hang- és videotámogatás"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: C/audio-video.page:34(page/p)
 msgid ""
-"An error message which says “<gui>Network error</gui>� appears in the main "
-"window."
-msgstr "A főablakban a „<gui>Hálózati hiba</gui>� üzenet jelenik meg."
+"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 ""
+"Csak olyan partnerekkel folytathat hang- és videohívást, akik maguk is ezt a "
+"szolgáltatást támogató klienst használnak. Ha a partner kliense támogatja a "
+"hang- vagy videohívást, akkor a partnerlistában a neve mellett a következő "
+"ikont láthatja:"
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error�"
-msgstr "A „Hálózati hiba� üzenetet kapom"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Ikon"
 
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Leírás"
 
-#: C/prob-conn-neterror.page:37(p)
+#: 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 ""
-"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/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
-"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/audio-input-microphone.png\">Hanghívások ikonja</media>"
 
-#: 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 ""
-"Ez a hiba akkor következik be, ha az <app>Empathy</app> valamilyen okból nem "
-"tud kommunikálni az azonnaliüzenő-szolgáltatással."
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "A partner képes hanghívás fogadására."
 
-#: C/prob-conn-neterror.page:45(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 ""
-"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/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"Ez a hiba következik be akkor is, ha becenév megadása nélkül próbál IRC-"
-"fiókot használni."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">"
+"Videohívások ikonja</media>"
+
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "A partner képes videohívás fogadására."
 
-#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
+"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 ""
-"Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
+"Hanghíváshoz az operációs rendszer által támogatott hangkártyára, és működő "
+"mikrofonra van szüksége."
 
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
+#: C/audio-video.page:87(note/p)
 msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
+"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 ""
-"Kattintson a hibaüzenetben a <media type=\"image\" mime=\"image/png\" src="
-"\"figures/gtk-edit.png\">Szerkesztés</media> ikonra."
+"Videohíváshoz az operációs rendszer által támogatott webkamerára, és működő "
+"mikrofonra van szüksége."
+
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Támogatott fióktípusok"
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
+#: C/audio-video.page:97(section/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."
+"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 ""
-"Ellenőrizze a <gui>Speciális</gui> szakaszban, hogy minden adat helyes-e. "
-"Ezeket az adatokat az üzenetküldő szolgáltatás weboldalán találhatja meg."
+"Csak bizonyos támogatott szolgáltatások fiókjainak használatakor van "
+"lehetősége hang- és videohívásokra. A következő táblázat felsorolja, hogy a "
+"hang és videó támogatott-e az egyes fióktípusokban."
 
-#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the 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 ""
-"Törölje az <gui>Engedélyezett</gui> jelölését, majd jelölje be újra a "
-"szolgáltatáshoz való ismételt csatlakozás megpróbálásához."
+"A fióktípusokat bővítmények biztosítják. Rendszerén lehet, hogy a következő "
+"típusok nem mindegyike érhető el, de rendelkezhet itt fel nem sorolt "
+"típusokkal is. A frissített bővítmények lehetővé tehetik a hang- és "
+"videohívásokat az itt nem támogatottként felsorolt fióktípusokkal."
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "Proxytámogatás"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Szolgáltatás"
 
-#: C/prob-conn-neterror.page:91(p)
-msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
-"Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Hang"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "„A név használatban�"
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Videó"
 
-#: C/prob-conn-name.page:10(desc)
-msgid ""
-"An error message which says “<gui>Name in use</gui>� appears in the main "
-"window."
-msgstr "A főablakban az „<gui>A név használatban</gui>� üzenet jelenik meg."
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Az „A név használatban� üzenetet kapom"
+#: 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 "Nem"
 
-#: 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 ""
-"Ez a hiba akkor következik be, ha az IRC-fiókjához próbál csatlakozni, és "
-"olyan becenevet használ, amit az adott hálózaton már valaki más használ."
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook csevegés"
 
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "A <gui>Becenév</gui> szövegdobozban adjon meg egy új becenevet."
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "Gadu-Gadu"
 
-#: 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\"/>."
-msgstr ""
-"Ha regisztrálta a becenevet az éppen használt hálózaton, akkor adja meg a "
-"jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-"
-"nick-password\"/> részt."
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/prob-conn-name.page:64(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."
-msgstr ""
-"Törölje az <gui>Engedélyezett</gui> négyzet jelölését a fiók neve mellett, "
-"majd jelölje be újra a szolgáltatáshoz való ismételt csatlakozás "
-"megpróbálásához."
+#: 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 "Igen"
 
-#: C/prob-conn-auth.page:8(desc)
-msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
-msgstr ""
-"A főablakban az „<gui>A hitelesítés meghiúsult</gui>� üzenet jelenik meg."
+#: 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 "Az „A hitelesítés meghiúsult� üzenetet kapom"
+#: 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 ""
-"Ez a hiba akkor következik be, ha az azonnaliüzenő-szolgáltatás nem "
-"engedélyezi a csatlakozást, mert valamiért nem ismeri fel az Ön "
-"felhasználónevét vagy jelszavát."
+#: 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 ""
-"Győződjön meg róla, hogy már regisztrált fiókot annál a szolgáltatásnál, "
-"amelyhez csatlakozni próbál. Ha nincs fiókja, a legtöbb szolgáltatás nem "
-"engedélyezi a csatlakozást."
+#: 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:54(p)
-msgid ""
-"Type your username and password again to make sure that they are correct."
-msgstr ""
-"�rja be újra felhasználónevét és jelszavát, így ellenőrizve hogy nem gépelte "
-"el azokat."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: 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 ""
-"A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "MySpace"
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "A fiókom nincs engedélyezve"
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "QQ"
 
-#: C/prob-conn-acctdisabled.page:35(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 ""
-"Ha a használni kívánt azonnaliüzenő-fiók nincs engedélyezve a legördülő "
-"fióklistában, amikor új társalgást akar kezdeni vagy be akar lépni egy "
-"csevegőszobába, akkor a fiók adatai hibásak lehetnek."
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Közeli emberek"
 
-#: C/prob-conn-acctdisabled.page:48(p)
-msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
-msgstr ""
-"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Fiókok</gui></guiseq> "
-"menüpontot, majd a nem működő fiókot."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "Sametime"
 
-#: C/prob-conn-acctdisabled.page:65(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."
-msgstr ""
-"Ellenőrizze, hogy az <gui style=\"checkbox\">Engedélyezve</gui> "
-"jelölőnégyzet be van-e jelölve. Ha nincs, akkor jelölje be a négyzetet a "
-"fiók engedélyezéséhez."
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "Silc"
 
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Böngéssze korábbi társalgásait, vagy keressen bennük."
+#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "Korábbi társalgások megjelenítése"
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:39(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."
+#: 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 ""
-"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."
+"Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
+
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Módosítsa állapotát"
 
-#: C/prev-conv.page:46(p)
+#: 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 ""
-"Az <app>Empathy</app> automatikusan menti az összes szöveges társalgását "
-"partnereivel. Lehetősége van <link xref=\"#search\">keresni az összes "
-"korábbi társalgásában</link>, vagy partner és dátum szerint <link xref="
-"\"#browse\">böngészni a korábbi társalgásokat</link>."
+"Beállíthatja állapotát az elérhetőségének jelzéséhez partnerei felé. Az "
+"<app>Empathy</app> lehetővé teszi a mentett állapotok listából való "
+"kiválasztását."
 
-#: C/prev-conv.page:54(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 ""
-"A korábbi társalgások megjelenítéséhez és az azokban való kereséshez nem "
-"kell az internethez kapcsolódni."
+"Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "Keresés korábbi társalgásokban"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Válasszon egy állapotot a listából."
 
-#: C/prev-conv.page:63(p)
+#: C/change-status.page:57(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-message\">add custom "
+#| "status messages</link> to provide more information about your "
+#| "availability to your contacts."
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr "Teljes szöveges keresést végezhet minden korábbi társalgásban."
+"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 ""
+"A beépített állapotok listájával és jelentésével kapcsolatban lásd az <link "
+"xref=\"status-icons\"/> oldalt. Felvehet <link xref=\"set-custom-status\">"
+"egyéni állapotüzeneteket</link> további információk közléséhez "
+"partnereivel az elérhetőségéről."
 
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(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 ""
-"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
-"gui><gui>Korábbi társalgások</gui></guiseq> menüpontot. Az <key>F3</key> "
-"billentyűt is megnyomhatja."
+"Ha egy ideig nem használja a számítógépet, vagy a képernyővédő bekapcsol, az "
+"állapot automatikusan „Távol� lesz."
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Válassza a <gui>Keresés</gui> lapot."
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Fiók regisztrálása valamelyik támogatott üzenetküldő szolgáltatással."
 
-#: C/prev-conv.page:74(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>."
-msgstr ""
-"Az <gui>Erre</gui> mezőbe írja be a keresendő szöveget. Nyomja meg a "
-"<gui>Keresés</gui> gombot, vagy az <key>Enter</key> billentyűt."
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Új fiók regisztrálása"
 
-#: C/prev-conv.page:78(p)
+#: C/create-account.page:36(page/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."
+"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 ""
-"A keresőmező alatt megjelennek azok a társalgások, amelyekben megtalálható a "
-"keresőkifejezés. A társalgások alapértelmezésben dátum szerint vannak "
-"rendezve."
+"A legtöbb fióktípus megköveteli fiók létrehozását egy szolgáltatónál ahhoz, "
+"hogy az <app>Empathyhoz</app> hasonló azonnaliüzenő alkalmazásokkal "
+"csatlakozhatna. Egyes szolgáltatók esetén használhatja az <app>Empathyt</"
+"app> új fiók regisztrálására, a <link xref=\"add-account\">fiók "
+"hozzáadásánál</link> használt lépéseket követve."
 
-#: C/prev-conv.page:82(p)
+#: C/create-account.page:42(page/p)
 msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"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 ""
-"Kattintson a társalgásra a megjelenítéséhez. Az <app>Empathy</app> kijelöli "
-"a keresőkifejezésre illeszkedő részt a társalgás szövegében."
+"Ez az oldal új fiók létrehozásával kapcsolatos információkat biztosít "
+"különböző fióktípusokhoz. A szolgáltatónak meg kell adnia a bejelentkezési "
+"azonosítót és jelszót, valamint az <app>Empathy</app> használatával való "
+"csatlakozáshoz esetleg szükséges további információkat."
 
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "Korábbi társalgások tallózása"
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/prev-conv.page:91(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 ""
-"A partnereivel vagy a csevegőszobákban folytatott korábbi társalgásokat "
-"dátum szerint tallózhatja."
-
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Válassza a <gui>Társalgások</gui> lapot."
+"A Facebook az egyik legtöbbet használt közösségi hálózat. Segítségével a "
+"felhasználók saját profilt hozhatnak létre, és kommunikálhatnak barátaikkal."
 
-#: C/prev-conv.page:103(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 ""
-"Válassza ki a fiókot a bal felső legördülő listából. A fiókhoz tartozó "
-"partnerek és csevegőszobák listája alul megjelenik."
+"A Facebook használatához a <link href=\"http://www.facebook.com\">www."
+"facebook.com</link> weboldalon kell létrehoznia egy új fiókot."
 
-#: C/prev-conv.page:107(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 ""
-"Válassza ki a partnert vagy csevegőszobát a korábbi társalgások "
-"megjelenítéséhez. Alapértelmezésben a legújabb társalgás jelenik meg."
+"A Jabber egy nyílt azonnaliüzenő-rendszer. Az e-mailhez hasonlóan a Jabber "
+"lehetővé teszi a szolgáltató megválasztását, és az összes Jabber "
+"felhasználóval való kommunikációt a szolgáltatótól függetlenül."
 
-#: C/prev-conv.page:111(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 ""
-"A társalgásokat dátum szerint böngészheti. Azok a napok, amelyeken a "
-"kiválasztott partnerrel társalgást folytatott, félkövéren jelennek meg. "
-"Kattintson a dátumra a kiválasztásához. Kattintson a hónap és az év melletti "
-"nyilakra a korábbi dátumok böngészéséhez."
+"Egy Jabber szolgáltatónál létre kell hoznia az új fiókot. Számos ingyenes "
+"szolgáltató van, az egyik népszerű a <link href=\"http://register.jabber.org/"
+"\">Jabber.org</link>."
 
-#: C/prev-conv.page:117(p)
+#: C/create-account.page:71(note/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."
+"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 ""
-"A megjelenített társalgásban a felső keresőmezőbe gépelve kereshet szöveget. "
-"Az illeszkedő szöveg kiemelésre kerül."
+"Ha a Google Mail vagy a Google Talk szolgáltatást használja, akkor már van "
+"Jabber fiókja. A Google Talk egy Jabber szolgáltatás. Google Mail címét és "
+"jelszavát használhatja az <app>Empathyban</app> a kapcsolódáshoz."
 
-#: C/prev-conv.page:121(p)
+#: 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>View 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 ""
-"A <gui>Partnerlista</gui> ablakból gyorsan megjelenítheti az egyes "
-"partnereivel folytatott korábbi társalgásait. Csak kattintson a jobb "
-"egérgombbal a partnerre, és válassza a <gui>Korábbi társalgások</gui> "
-"menüpontot. Megnyílik a <gui>Korábbi társalgások</gui> ablak, és az adott "
-"partner lesz kiválasztva."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Különböző partnerek egyesítése és szétválasztása"
+"Ezen szolgáltatás használatához nem szükséges fiókot létrehoznia egy "
+"szolgáltatónál. A szolgáltatás akkor működik, amikor helyi hálózathoz, "
+"például vezeték nélküli hotspothoz kapcsolódik, és képes automatikusan "
+"megtalálni a szolgáltatás többi felhasználóját az adott hálózaton."
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Partnerek egyesítése és szétválasztása"
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "További információkért lásd a <link xref=\"salut-protocol\"/> oldalt."
 
-#: C/link-contacts.page:26(p)
+#: C/create-account.page:91(section/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."
+"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 ""
-"Ha egy partnere több fiókkal is rendelkezik különböző szolgáltatóknál, akkor "
-"ezeket a partnerbejegyzéseket egyesítheti."
+"A SIP egy nyílt rendszer, amely lehetővé teszi felhasználóinak hang- és "
+"videohívások bonyolítását az interneten. Létre kell hoznia egy fiókot egy "
+"SIP-szolgáltatónál. Az összes SIP-felhasználóval kommunikálhat, függetlenül "
+"az általuk használt szolgáltatótól."
 
-#: C/link-contacts.page:30(p)
+#: C/create-account.page:97(note/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
+"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 ""
-"Az eredményül kapott partnert <em>metapartnernek</em> hívjuk: ez egy több "
-"önálló partnerbejegyzésből álló partner."
+"Technikai nehézségek miatt az ingyenes <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> szolgáltatás jelenleg nem működik "
+"az <app>Empathyval</app>."
 
-#: C/link-contacts.page:34(p)
+#: C/create-account.page:102(section/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"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 ""
-"Ha rendelkezik egy Kovács Erzsébet nevű partnerrel, aki három különböző "
-"üzenetküldő szolgáltatást használ:"
-
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "ekovacs@facebook"
-
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "erzsebet.kovacs@gmail"
-
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "erzsebet_kovacs@hotmail"
+"Egyes SIP-szolgáltatók lehetővé teszik normál telefonok hívását a "
+"számítógépéről. Az ilyen szolgáltatásra általában elő kell fizetni."
 
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
+#: C/create-account.page:109(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."
 msgstr ""
-"Ezeket a partnerbejegyzéseket egyetlen Kovács Erzsébet bejegyzéssé "
-"egyesítheti."
-
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Partnerek egyesítése"
+"Az IRC használatához nem kell fiókot regisztrálni. Noha meg kell adnia egy "
+"becenevet az IRC-fiók felvételekor az <app>Empathyba</app>, ez a becenév "
+"csak az egyes csatlakozásokkor jön létre. Ha másik felhasználó használja a "
+"becenevet, akkor újat kell választania."
 
-#: C/link-contacts.page:63(p)
+#: C/create-account.page:114(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 IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
-"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a különböző "
-"fiókokkal rendelkező partnerére, és válassza a <gui style=\"menuitem"
-"\">Partnerek összekapcsolása…</gui> menüpontot."
+"Egyes IRC-hálózatok egy NickServ nevű szolgáltatást használnak, amely "
+"lehetővé teszi felhasználóiknak beceneveik megvédését. További "
+"információkért lásd a <link xref=\"irc-nick-password\"/> oldalt."
 
-#: C/link-contacts.page:70(p)
+#: C/create-account.page:117(section/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"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 ""
-"A <gui>Partnerek összekapcsolása</gui> ablak bal oldalán válassza ki az "
-"egyesíteni kívánt partnereket."
+"Egyes IRC-kiszolgálók jelszóval védettek. Az ilyen kiszolgálókhoz "
+"csatlakozáskor ismernie kell a jelszót. Ezek általában privát IRC-hálózatok."
 
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Nyomja meg az <gui style=\"button\">Összekapcsolás</gui> gombot."
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Zárt szolgáltatások"
 
-#: C/link-contacts.page:82(p)
+#: C/create-account.page:124(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."
+"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 ""
-"Metapartner létrehozása esetén az alapértelmezett partner, amellyel dupla "
-"kattintással társalgást kezdeményez, a leghosszabb online jelenléttel "
-"rendelkező partnerbejegyzés lesz."
+"Számos zárt azonnaliüzenő-szolgáltatást fejlesztettek különböző cégek és "
+"szervezetek. Az <app>Empathy</app> lehetővé teszi a kapcsolódást meglévő "
+"fiókjával a legnépszerűbb szolgáltatásokhoz. Új fiók létrehozásához fel kell "
+"keresnie a szolgáltató weboldalát, és el kell fogadnia a felhasználási "
+"feltételeket."
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Metapartnerek szétválasztása"
+#: 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/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 ""
-"A <gui>Partnerlistában</gui> kattintson a jobb egérgombbal a szétválasztani "
-"kívánt metapartnerre, és válassza a <gui style=\"menuitem\">Partnerek "
-"összekapcsolása</gui> menüpontot."
+#: 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/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Nyomja meg a <gui style=\"button\">Szétválasztás</gui> gombot."
+#: 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:8(desc)
-msgid "Legal information."
-msgstr "Jogi információk."
+#: 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:11(title)
-msgid "License"
-msgstr "Licenc"
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr ""
+"A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
+
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Fiók letiltása"
 
-#: C/license.page:12(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported 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 ""
-"Ez a mű a CreativeCommons Attribution-Share Alike 3.0 Unported licenc "
-"feltételei szerint terjeszthető."
+"A fiókok letilthatók, ekkor az <app>Empathy</app> nem fog bejelentkezni, de "
+"a fiók sem kerül eltávolításra. Bizonyos helyzetekben szükség lehet a fiók "
+"letiltására és újraengedélyezésére, ha csak néha szeretne bejelentkezni a "
+"fiókba, de más fiókokhoz továbbra is az <app>Empathyt</app> szeretné "
+"használni."
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Jogodban áll:"
+#: C/disable-account.page:53(item/p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Megosztani"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Az ablak jobb oldalán kapcsolja ki."
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Másolni, terjeszteni és továbbítani a művet."
+#: C/disable-account.page:62(page/p)
+#| msgid ""
+#| "To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
+#| "gui>."
+msgid "To re-enable the account, switch it on."
+msgstr "A fiók újraengedélyezéséhez kapcsolja be azt."
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Feldolgozni"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Kedvenc szobák beállítása, kezelése és csatlakozás azokhoz."
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Módosítani a művet."
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Kedvenc szobák"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "A következő feltételek szerint:"
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Szoba beállítása kedvencként"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Nevezd meg!"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Csatlakozás szobához."
 
-#: C/license.page:39(p)
+#: C/favorite-rooms.page:40(item/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)."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
-"A szerző vagy a jogosult által meghatározott módon fel kell tüntetned a "
-"műhöz kapcsolódó információkat (pl. a szerző nevét vagy álnevét, a Mű címét)."
-
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "�gy add tovább!"
+"IRC-szobához csatlakozással kapcsolatos további információkért lásd a <link "
+"xref=\"irc-join-room\"/> oldalt."
 
-#: C/license.page:47(p)
+#: C/favorite-rooms.page:46(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."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"Ha megváltoztatod, átalakítod, feldolgozod ezt a művet, az így létrejött "
-"alkotást csak a jelenlegivel megegyező licenc alatt terjesztheted."
+"Csoportos társalgáshoz csatlakozással kapcsolatos további információkért "
+"lásd a <link xref=\"group-conversations\"/> oldalt."
 
-#: C/license.page:53(p)
+#: C/favorite-rooms.page:54(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 conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"A licenc teljes szövegéért lásd a <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/legalcode\">CreativeCommons weboldalát</link>, vagy a "
-"teljes <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons "
-"összefoglalót</link>."
+"A társalgás ablakban válassza a <guiseq><gui>Társalgás</gui><gui>Kedvenc "
+"csevegőszoba</gui></guiseq> menüpontot."
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Társalgás kezdése IRC-partnerrel."
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Belépés kedvenc szobákba"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Csevegjen IRC-n"
+#: 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 "A <gui>Partnerlista</gui> ablakban hajtsa végre a következők egyikét:"
 
-#: 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 ""
-"Személyes társalgást folytathat más IRC-felhasználókkal a nyilvános IRC-"
-"csevegőszobákon kívül. Társalgás kezdeményezéséhez egy másik IRC-"
-"felhasználóval:"
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Nyomja meg az <key>F5</key> billentyűt."
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:76(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>."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"Egy IRC-csevegőszoba partnerlistájában kattintson duplán a felhasználó "
-"nevére, akivel csevegni szeretne. Ezen kívül rákattinthat a jobb egérgombbal "
-"is a felhasználó nevére, és kiválaszthatja a <gui>Csevegés</gui> menüpontot."
+"Válassza a <guiseq><gui>Szoba</gui><gui>Csatlakozás a kedvencekhez</gui></"
+"guiseq> menüpontot az összes kedvenc szobába való belépéshez."
 
-#: 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:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
 msgstr ""
-"Az IRC-szoba partnerlistája nem azonos az <app>Empathy</app> "
-"partnerlistájával. Ez az adott IRC-szoba felhasználóinak listáját "
-"tartalmazza. A különböző szobákban különböző partnerek vannak felsorolva."
+"Válassza a <gui>Szoba</gui> menüpontot, majd a kedvenc szobát, amelybe be "
+"szeretne lépni."
 
-#: C/irc-start-conversation.page:52(p)
+#: C/favorite-rooms.page:90(note/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 ""
-"Az IRC-szoba partnerlistája általában az IRC-szoba ablakának jobb oldalán "
-"van. Ha nem látja, akkor válassza a <guiseq><gui>Társalgás</"
-"gui><gui>Partnerlista megjelenítése</gui></guiseq> menüpontot."
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
-"Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Fájlok küldése IRC használatával."
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Jelenleg nem lehetséges a fájlok küldése IRC használatával."
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Védje meg becenevét, hogy más IRC-felhasználók ne használhassák azt."
+"Kedvenc szobába való belépéshez csatlakozva kell lennie az internethez és "
+"fiókjához."
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Jelszó használata IRC becenévhez"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Kedvenc szobák kezelése"
 
-#: C/irc-nick-password.page:35(p)
+#: C/favorite-rooms.page:101(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."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"Egyes IRC-hálózatokon lehetősége van becenevének regisztrálására a NickServ "
-"nevű szolgáltatásnál. A NickServnek küldött speciális üzenetekkel "
-"beállíthatja jelszavát, és azonosíthatja magát. Egyes IRC-csevegőszobák nem "
-"engedik belépni regisztrált becenév nélkül."
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
+"gui><gui>Kedvencek kezelése</gui></guiseq> menüpontot."
 
-#: C/irc-nick-password.page:40(p)
+#: C/favorite-rooms.page:107(item/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."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
 msgstr ""
-"Az <app>Empathy</app> jelenleg nem támogatja a becenév regisztrálását. Egyes "
-"IRC-hálózatok azonban automatikusan továbbítanak egy <em>kiszolgálójelszót</"
-"em> a NickServnek. Ezeken a hálózatokon az IRC-jelszavát az <app>Empathy</"
-"app> segítségével használhatja azonosításra a NickServ felé. A népszerű "
-"FreeNode hálózat rendelkezik ezzel a szolgáltatással."
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "IRC-kiszolgálójelszó beállítása:"
-
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "Válassza ki az IRC-fiókot az ablak bal oldalán lévő listából."
+"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki azt a fiókot, "
+"amelynek kedvenc szobáit módosítani szeretné."
 
-#: C/irc-nick-password.page:57(p)
-msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
 msgstr ""
-"A <gui>Jelszó</gui> mezőben írja be a beceneve regisztrálásához használt "
-"jelszót."
+"Válassza az <gui>Összes</gui> lehetőséget az összes kedvenc szoba "
+"megjelenítéséhez."
 
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Nyomja meg az <gui style=\"button\">Alkalmaz</gui> gombot."
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Válassza ki a kezelni kívánt kedvenc szobát:"
 
-#: C/irc-nick-password.page:69(p)
+#: C/favorite-rooms.page:121(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>."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
-"Ezek az utasítások csak bizonyos IRC-hálózatokon teszik lehetővé jelszóval "
-"védett becenév használatát. Jelenleg az <app>Empathy</app> használatával nem "
-"lehet IRC-becenevet regisztrálni, vagy a becenév jelszavát módosítani."
-
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "IRC használata az <app>Empathyval</app>."
-
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Interneten továbbított csevegés (IRC)"
+"Jelölje be az <gui>Automatikus kapcsolódás</gui> négyzetet a szobába való "
+"automatikus belépéshez a fiókjához kapcsolódáskor."
 
-#: 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>."
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
 msgstr ""
-"Az IRC protokoll <app>Empathyban</app> való használatához telepíteni kell a "
-"<sys>telepathy-idle</sys> csomagot."
+"Kattintson az <gui>Eltávolítás</gui> gombra a szoba eltávolításához "
+"kedvencei közül."
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "A telepathy-idle telepítése"
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Ha befejezte, nyomja meg a <gui>Bezárás</gui> gombot."
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "IRC-csevegőszobák és társalgások"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "A helymeghatározás megismerése és használata az <app>Empathyban</app>."
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Csevegőszobák és társalgások"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Földrajzi hely"
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Gyakori IRC-problémák"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Helymeghatározás"
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Gyakori problémák"
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Gyakori problémák javítása"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Csatlakozás IRC-csatornához."
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "Az <app>Empathy</app> nem teszi közzé a földrajzi helyet."
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Csatlakozás IRC-csevegőszobához"
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "A földrajzi hely nem kerül közzétételre"
 
-#: C/irc-join-room.page:33(p)
+#: C/geolocation-not-showing.page:34(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\"/>."
+"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 ""
-"Az IRC-csevegőszobákba (IRC-csatornákra) bármely IRC-hálózaton beléphet, "
-"amelyhez csatlakozva van. Az IRC-hálózatokhoz való csatlakozással "
-"kapcsolatban lásd az <link xref=\"add-account\"/> és <link xref=\"account-irc"
-"\"/> témákat."
+"Ha partnerei nem látják földrajzi helyét, akkor az <app>Empathy</app> lehet, "
+"hogy nem képes elégséges pontossággal meghatározni azt."
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
+#: C/geolocation-not-showing.page:38(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
-"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
-"gui><gui>Csatlakozás</gui></guiseq> menüpontot."
+"Ebben az esetben az Ön földrajzi helye nem kerül közzétételre, de partnerei "
+"helyét továbbra is látni fogja."
 
-#: C/irc-join-room.page:45(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
 msgstr ""
-"A <gui>Felhasználói fiók</gui> legördülő listában válassza ki a használni "
-"kívánt hálózatnak megfelelő IRC-fiókot."
+"Ha közzé szeretné tenni földrajzi helyét, akkor megpróbálhat külső eszközt, "
+"például GPS-t  használni."
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-not-showing.page:48(note/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>)."
+"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 ""
-"A <gui>Szoba</gui> szövegmezőbe írja be a csatorna nevét, amelyhez "
-"csatlakozni kíván. Az IRC-csatornák neve a kettős kereszt karakterrel "
-"(<sys>#</sys>) kezdődik."
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Nyomja meg a <gui>Csatlakozás</gui> gombot a szobába való belépéshez."
+"Földrajzi helyének közzétételéhez az Ön által használt Jabber kiszolgálónak "
+"támogatnia kell a PEP specifikációt. A <link href=\"http://coccinella.im/"
+"servers/servers_by_pubsub_pep.html\">PEP-et támogató kiszolgálók</link> "
+"listája online elérhető. A Google Talk jelenleg nem támogatja ezt a "
+"szolgáltatást."
 
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
-"Több szobához is csatlakozhat, minden szobához megismételve a fenti "
-"lépéseket."
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Milyen információk kerülnek elküldésre és kinek."
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Belépés jelszóval védett IRC-csevegőszobákba."
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Helymeghatározás és adatvédelem"
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Csatlakozás védett IRC-csevegőszobához"
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Milyen információk kerülnek elküldésre"
 
-#: C/irc-join-pwd.page:27(p)
+#: C/geolocation-privacy.page:36(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:"
-msgstr ""
-"Egyes IRC-hálózatokon a privát IRC-szobák jelszóval védettek lehetnek. Ha "
-"ismeri a jelszót, akkor tegye a következőket a csatlakozáshoz:"
-
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+"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 ""
-"<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
+"A következők elküldése lehetséges: ország, régió, helység, terület, utca, "
+"épület, emelet, szoba, irányítószám, hosszúság, szélesség, magasság, "
+"sebesség és irány."
 
-#: C/irc-join-pwd.page:38(p)
+#: C/geolocation-privacy.page:40(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>."
+"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 ""
-"Az Empathy bekéri a jelszót. Adja meg az IRC-csevegőszoba jelszavát, és "
-"nyomja meg a <gui style=\"button\">Csatlakozás</gui> gombot."
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "A támogatott IRC-parancsok."
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Támogatott IRC-parancsok"
+"A földrajzi helyével kapcsolatos információk pontossága és mennyisége a "
+"szoftveren, vagy a helymeghatározásra használt infrastruktúrán alapul."
 
-#: C/irc-commands.page:19(p)
+#: C/geolocation-privacy.page:44(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>."
+"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 ""
-"A támogatott IRC-parancsok listájának megjelenítéséhez a csevegőszobában "
-"írja be a <input>/help</input> utasítást, és nyomja meg az <key>Enter</key> "
-"billentyűt."
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "Minden elérhető parancshoz tartozik egy rövid használati utasítás."
+"A különböző hálózatok különböző pontossági beállításokkal rendelkezhetnek, "
+"és különböző információkat küldhetnek. A külső eszközök, például GPS vagy "
+"mobiltelefonok használata növeli az elküldött információk pontosságát."
 
-#. 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"
+"Az adatvédelmi módot bekapcsolva a városnál pontosabb információ nem kerül "
+"elküldésre, még ha külső eszközt is használ."
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Az <app>Empathy</app> üzenetküldő bemutatása."
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Ki láthatja az elküldött információkat"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Bevezetés"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Csak partnerei láthatják az Ön földrajzi helyzetét."
 
-#: C/introduction.page:23(p)
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Mi az adatvédelmi mód"
+
+#: 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 ""
-"Az <app>Empathy</app> egy üzenetküldő alkalmazás a GNOME asztali "
-"környezethez. Támogatja a szöveges üzenetküldést, hang- és videohívásokat, "
-"fájlátvitelt és a legtöbbet használt üzenetküldő rendszereket, mint az MSN "
-"és a Google Talk."
+"Az alapértelmezésben engedélyezett adatvédelmi mód egy csökkentett "
+"pontosságú mód, amely csökkenti a partnereinek küldött földrajzi hely "
+"pontosságát."
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Adatvédelem áttekintése"
 
-#: 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 ""
-"Az <app>Empathy</app> szolgáltatásai segítik a jobb együttműködést "
-"munkahelyén, és lehetővé teszik a kapcsolattartást barátaival."
+"Az <app>Empathy</app> helymeghatározással kapcsolatos adatvédelmi "
+"beállításainak áttekintése."
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "A helymeghatározás alapértelmezésben nincs bekapcsolva."
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "Az adatvédelmi mód alapértelmezésben be van kapcsolva."
+
+#: 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 ""
-"Az <app>Empathy</app> segítségével összes társalgását egyetlen ablakba "
-"csoportosíthatja, több ablakban tarthatja a különböző társalgásokat, "
-"egyszerűen kereshet a korábbi társalgásokban, és két kattintással "
-"megoszthatja asztalát."
+"Az adatvédelmi mód külső és pontosabb eszközök használata esetén is "
+"bekapcsolva marad."
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "<gui>Partnerlista</gui> ablak"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Csak partnerei láthatják földrajzi helyét."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Az <app>Empathy</app> főablaka"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "A helymeghatározást támogató szolgáltatások és kompatibilitás."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Az <app>Empathy</app> főablaka."
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Támogatott szolgáltatások"
 
-#. 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 "Empathy üzenetküldő"
+"Jelenleg a helymeghatározási szolgáltatás csak a Jabber szolgáltatással "
+"kompatibilis. Használatához Önnek és partnereinek is Jabber fiókot kell "
+"használniuk."
 
-#: 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\"> "
-"Empathy üzenetküldő logója </media> Empathy üzenetküldő"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Fiókkezelés"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Partnerkezelés"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Szöveges csevegések"
+"Az Ön által használt kiszolgálónak is támogatnia kell a helymeghatározási "
+"szolgáltatást. A legtöbb Jabber kiszolgáló támogatja. További információkért "
+"nézze meg a szolgáltatás webhelyének dokumentációját."
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Hang- és videocsevegések"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Kompatibilitás"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Speciális műveletek"
+#: 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 ""
+"Az <app>Empathy</app> helymeghatározási szolgáltatása nem kompatibilis más "
+"helymeghatározási szolgáltatásokkal, mint például a <em>Google Latitude</"
+"em>, <em>Yahoo Fire Eagle</em> vagy <em>Brightkite</em>."
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Felhasználói fiók importálása másik azonnaliüzenő alkalmazásból."
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Helymeghatározás be- és kikapcsolása <app>Empathyban</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 "Helymeghatározás be- és kikapcsolása"
 
-#: 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 ""
+"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> "
+"menüpontot."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Meglévő fiók importálása"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Válassza a <gui>Hely</gui> lapot."
 
-#: 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 ""
-"Az <app>Empathy</app> első futtatásakor felajánlja felhasználói fiókjainak "
-"importálását más azonnaliüzenő alkalmazásokból. Jelenleg az egyetlen "
-"támogatott ilyen alkalmazás a <app>Pidgin</app>."
+"Jelölje be a <gui>Hely közzététele a partnereimnek</gui> négyzetet a "
+"helymeghatározás aktiválásához."
 
-#: C/import-account.page:50(p)
-msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
-msgstr ""
-"Az <app>Empathy</app> első futtatásakor egy asszisztens számos lehetőséget "
-"kínál fel új felhasználói fiókok létrehozásához."
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "A helymeghatározás kikapcsolásához törölje a négyzetet."
 
-#: C/import-account.page:54(p)
+#: C/geolocation-turn.page:55(item/p)
 msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
-msgstr ""
-"Válassza az <gui>Igen, fiókadatok importálása ebből:</gui> lehetőséget, és "
-"nyomja meg a <gui>Tovább</gui> gombot."
-
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
-"Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
+"A földrajzi hely pontosságának növeléséhez törölje a <gui>Hely pontosságának "
+"csökkentése</gui> négyzetet."
 
-#: C/import-account.page:66(p)
+#: C/geolocation-turn.page:61(item/p)
 msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
+"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 ""
-"Jelenleg nincs lehetőség fiókok importálására az első futtatáskor megjelenő "
-"asszisztens bezárása után."
+"Ha rendelkezik külső eszközzel, például GPS-szel, vagy pontosabb helyet "
+"szeretne küldeni, akkor válassza ki a megfelelő lehetőséget a "
+"<gui>Helyforrások</gui> szakaszban."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr "A kilépett partnerek elrejtése a <gui>Partnerlistáról</gui>."
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "A helymeghatározás bemutatása."
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Kilépett partnerek elrejtése"
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Mi az a helymeghatározás"
 
-#: C/hide-contacts.page:21(p)
+#: C/geolocation-what-is.page:35(page/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."
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
 msgstr ""
-"�ltalában az <app>Empathy</app> megjeleníti az összes partnert: az "
-"elérhetőket, akikkel társalgást kezdhet, és a kilépetteket is."
+"A helymeghatározás lehetővé teszi egy internetre csatlakozó számítógép vagy "
+"eszköz valódi földrajzi helyét."
 
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "A kilépett partnerek elrejtése:"
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Az <app>Empathy</app> helymeghatározása segítségével:"
+
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Közzéteheti földrajzi helyét partnerei számára."
+
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "Láthatja partnerei földrajzi helyét."
 
-#: 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 ""
-"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
-"gui><gui>Kilépett partnerek</gui></guiseq> menüpontot, vagy nyomja meg a "
-"<keyseq><key>Ctrl</key><key>H</key></keyseq> billentyűkombinációt."
+"Beállíthatja a földrajzi hely és a hely meghatározására használt eszköz "
+"pontosságát."
 
-#: 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 ""
-"A kilépett partnerek ismételt megjelenítéséhez ismételje meg a fenti "
-"eljárást."
+"A partnerei földrajzi helyének megjelenítéséhez partnereinek "
+"helymeghatározást támogató szolgáltatást és alkalmazást kell használniuk."
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "Csoportos társalgás indítása partnereivel, vagy csatlakozás egyhez"
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Csoportos társalgások"
 
-#: 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."
@@ -1858,7 +1811,7 @@ msgstr ""
 "A csoportos társalgások lehetővé teszik a szöveges társalgást egyszerre több "
 "partnerrel."
 
-#: 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."
@@ -1866,7 +1819,7 @@ msgstr ""
 "Csoportos társalgáshoz regisztrált Jabber, Google Talk vagy Közeli emberek "
 "fiókkal kell rendelkeznie."
 
-#: 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."
@@ -1874,11 +1827,20 @@ msgstr ""
 "Csak az Ön által is használt szolgáltatást használó partnerekkel folytathat "
 "csoportos társalgást."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Csoportos társalgás indítása"
 
-#: 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 ""
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
+"gui><gui>Csatlakozás</gui></guiseq> menüpontot."
+
+#: 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."
@@ -1886,7 +1848,7 @@ msgstr ""
 "A <gui>Felhasználói fiók</gui> legördülő listában válassza ki a csoportos "
 "társalgáshoz használandó fiókot."
 
-#: 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."
@@ -1894,17 +1856,17 @@ msgstr ""
 "A <gui>Kiszolgáló</gui> szövegmezőbe írja be a kiszolgáló nevét, amelyen a "
 "társalgás helyet kap."
 
-#: 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 "Üresen hagyva az aktuális kiszolgáló lesz használatban."
 
-#: 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."
 msgstr "A <gui>Szoba</gui> szövegmezőbe írja be a társalgásnak adandó nevet."
 
-#: 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 "
@@ -1914,7 +1876,7 @@ msgstr ""
 "elérhető lesz mások számára, és szabadon csatlakozhatnak. Privát szoba "
 "létrehozása nem lehetséges."
 
-#: 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 "
@@ -1924,13 +1886,13 @@ msgstr ""
 "más partnerek meghívásához a csoportos társalgásba, és tegye a következők "
 "egyikét:"
 
-#: 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 ""
 "Kattintson a jobb egérgombbal a partnerre, és válassza a <gui>Meghívás "
 "csevegőszobába</gui> menüpontot."
 
-#: 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>."
@@ -1938,7 +1900,7 @@ msgstr ""
 "Válassza a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Meghívás "
 "csevegőszobába</gui></guiseq> menüpontot."
 
-#: 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."
@@ -1946,21 +1908,21 @@ msgstr ""
 "Ha több csoportos társalgás is meg van nyitva, akkor válassza ki azt, "
 "amelyikbe meg szeretné hívni partnereit."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Csatlakozás csoportos társalgáshoz"
 
-#: 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 ""
 "Nyissa ki a <gui>Szobalista</gui> fejezetet az összes létező szoba "
 "megjelenítéséhez."
 
-#: 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 "Kattintson duplán a szoba nevére a belépéshez."
 
-#: 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 "
@@ -1970,1491 +1932,1809 @@ msgstr ""
 "kérhetnek, vagy csak meghívással lehetnek láthatók. Az <app>Empathy</app> "
 "nem támogatja az ilyen szobákat."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "A helymeghatározás bemutatása."
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "A kilépett partnerek elrejtése a <gui>Partnerlistáról</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Mi az a helymeghatározás"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Kilépett partnerek elrejtése"
 
-#: 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 ""
-"A helymeghatározás lehetővé teszi egy internetre csatlakozó számítógép vagy "
-"eszköz valódi földrajzi helyét."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Az <app>Empathy</app> helymeghatározása segítségével:"
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Közzéteheti földrajzi helyét partnerei számára."
+"�ltalában az <app>Empathy</app> megjeleníti az összes partnert: az "
+"elérhetőket, akikkel társalgást kezdhet, és a kilépetteket is."
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr "Láthatja partnerei földrajzi helyét."
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "A kilépett partnerek elrejtése:"
 
-#: 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 ""
-"Beállíthatja a földrajzi hely és a hely meghatározására használt eszköz "
-"pontosságát."
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
+"gui><gui>Kilépett partnerek</gui></guiseq> menüpontot, vagy nyomja meg a "
+"<keyseq><key>Ctrl</key><key>H</key></keyseq> billentyűkombinációt."
 
-#: 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 ""
-"A partnerei földrajzi helyének megjelenítéséhez partnereinek "
-"helymeghatározást támogató szolgáltatást és alkalmazást kell használniuk."
+"A kilépett partnerek ismételt megjelenítéséhez ismételje meg a fenti "
+"eljárást."
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Helymeghatározás be- és kikapcsolása <app>Empathyban</app>."
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Felhasználói fiók importálása másik azonnaliüzenő alkalmazásból."
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Helymeghatározás be- és kikapcsolása"
+#: 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>."
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Meglévő fiók importálása"
+
+#: 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 ""
-"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> "
-"menüpontot."
+"Az <app>Empathy</app> első futtatásakor felajánlja felhasználói fiókjainak "
+"importálását más azonnaliüzenő alkalmazásokból. Jelenleg az egyetlen "
+"támogatott ilyen alkalmazás a <app>Pidgin</app>."
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Válassza a <gui>Hely</gui> lapot."
+#: 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 ""
+"Az <app>Empathy</app> első futtatásakor egy asszisztens számos lehetőséget "
+"kínál fel új felhasználói fiókok létrehozásához."
 
-#: 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 ""
-"Jelölje be a <gui>Hely közzététele a partnereimnek</gui> négyzetet a "
-"helymeghatározás aktiválásához."
+"Válassza az <gui>Igen, fiókadatok importálása ebből:</gui> lehetőséget, és "
+"nyomja meg a <gui>Tovább</gui> gombot."
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "A helymeghatározás kikapcsolásához törölje a négyzetet."
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr ""
+"Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
 
-#: 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 ""
-"A földrajzi hely pontosságának növeléséhez törölje a <gui>Hely pontosságának "
-"csökkentése</gui> négyzetet."
+"Jelenleg nincs lehetőség fiókok importálására az első futtatáskor megjelenő "
+"asszisztens bezárása utá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 ""
-"Ha rendelkezik külső eszközzel, például GPS-szel, vagy pontosabb helyet "
-"szeretne küldeni, akkor válassza ki a megfelelő lehetőséget a "
-"<gui>Helyforrások</gui> szakaszban."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "A helymeghatározást támogató szolgáltatások és kompatibilitás."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Az <app>Empathy</app> üzenetküldő bemutatása."
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Támogatott szolgáltatások"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Bevezetés"
 
-#: 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 ""
-"Jelenleg a helymeghatározási szolgáltatás csak a Jabber szolgáltatással "
-"kompatibilis. Használatához Önnek és partnereinek is Jabber fiókot kell "
-"használniuk."
+"Az <app>Empathy</app> egy üzenetküldő alkalmazás a GNOME asztali "
+"környezethez. Támogatja a szöveges üzenetküldést, hang- és videohívásokat, "
+"fájlátvitelt és a legtöbbet használt üzenetküldő rendszereket, mint az MSN "
+"és a 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 ""
-"Az Ön által használt kiszolgálónak is támogatnia kell a helymeghatározási "
-"szolgáltatást. A legtöbb Jabber kiszolgáló támogatja. További információkért "
-"nézze meg a szolgáltatás webhelyének dokumentációját."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Kompatibilitás"
+"Az <app>Empathy</app> szolgáltatásai segítik a jobb együttműködést "
+"munkahelyén, és lehetővé teszik a kapcsolattartást barátaival."
 
-#: 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 ""
-"Az <app>Empathy</app> helymeghatározási szolgáltatása nem kompatibilis más "
-"helymeghatározási szolgáltatásokkal, mint például a <em>Google Latitude</"
-"em>, <em>Yahoo Fire Eagle</em> vagy <em>Brightkite</em>."
+"Az <app>Empathy</app> segítségével összes társalgását egyetlen ablakba "
+"csoportosíthatja, több ablakban tarthatja a különböző társalgásokat, "
+"egyszerűen kereshet a korábbi társalgásokban, és két kattintással "
+"megoszthatja asztalát."
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Milyen információk kerülnek elküldésre és kinek."
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>Partnerlista</gui> ablak"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Helymeghatározás és adatvédelem"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Az <app>Empathy</app> főablaka"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Milyen információk kerülnek elküldésre"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "Az <app>Empathy</app> főablaka."
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "A támogatott IRC-parancsok."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Támogatott IRC-parancsok"
+
+#: 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 ""
-"A következők elküldése lehetséges: ország, régió, helység, terület, utca, "
-"épület, emelet, szoba, irányítószám, hosszúság, szélesség, magasság, "
-"sebesség és irány."
+"A támogatott IRC-parancsok listájának megjelenítéséhez a csevegőszobában "
+"írja be a <input>/help</input> utasítást, és nyomja meg az <key>Enter</key> "
+"billentyűt."
+
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "Minden elérhető parancshoz tartozik egy rövid használati utasítás."
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Belépés jelszóval védett IRC-csevegőszobákba."
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Csatlakozás védett IRC-csevegőszobához"
 
-#: C/geolocation-privacy.page:40(p)
+#: C/irc-join-pwd.page:27(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."
+"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 ""
-"A földrajzi helyével kapcsolatos információk pontossága és mennyisége a "
-"szoftveren, vagy a helymeghatározásra használt infrastruktúrán alapul."
+"Egyes IRC-hálózatokon a privát IRC-szobák jelszóval védettek lehetnek. Ha "
+"ismeri a jelszót, akkor tegye a következőket a csatlakozáshoz:"
 
-#: C/geolocation-privacy.page:44(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."
+#: C/irc-join-pwd.page:33(item/p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
 msgstr ""
-"A különböző hálózatok különböző pontossági beállításokkal rendelkezhetnek, "
-"és különböző információkat küldhetnek. A külső eszközök, például GPS vagy "
-"mobiltelefonok használata növeli az elküldött információk pontosságát."
+"<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
 
-#: C/geolocation-privacy.page:49(p)
+#: 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 ""
-"Az adatvédelmi módot bekapcsolva a városnál pontosabb információ nem kerül "
-"elküldésre, még ha külső eszközt is használ."
+"Az Empathy bekéri a jelszót. Adja meg az IRC-csevegőszoba jelszavát, és "
+"nyomja meg a <gui style=\"button\">Csatlakozás</gui> gombot."
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Ki láthatja az elküldött információkat"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Csatlakozás IRC-csatornához."
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Csak partnerei láthatják az Ön földrajzi helyzetét."
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Csatlakozás IRC-csevegőszobához"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Mi az adatvédelmi mód"
+#: 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 ""
+"Az IRC-csevegőszobákba (IRC-csatornákra) bármely IRC-hálózaton beléphet, "
+"amelyhez csatlakozva van. Az IRC-hálózatokhoz való csatlakozással "
+"kapcsolatban lásd az <link xref=\"add-account\"/> és <link xref=\"account-irc"
+"\"/> témákat."
 
-#: 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 ""
-"Az alapértelmezésben engedélyezett adatvédelmi mód egy csökkentett "
-"pontosságú mód, amely csökkenti a partnereinek küldött földrajzi hely "
-"pontosságát."
+"A <gui>Felhasználói fiók</gui> legördülő listában válassza ki a használni "
+"kívánt hálózatnak megfelelő IRC-fiókot."
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Adatvédelem áttekintése"
+#: 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 ""
+"A <gui>Szoba</gui> szövegmezőbe írja be a csatorna nevét, amelyhez "
+"csatlakozni kíván. Az IRC-csatornák neve a kettős kereszt karakterrel "
+"(<sys>#</sys>) kezdődik."
+
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Nyomja meg a <gui>Csatlakozás</gui> gombot a szobába való belépéshez."
 
-#: 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 ""
-"Az <app>Empathy</app> helymeghatározással kapcsolatos adatvédelmi "
-"beállításainak áttekintése."
+"Több szobához is csatlakozhat, minden szobához megismételve a fenti "
+"lépéseket."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "A helymeghatározás alapértelmezésben nincs bekapcsolva."
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "IRC használata az <app>Empathyval</app>."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "Az adatvédelmi mód alapértelmezésben be van kapcsolva."
+#: C/irc-manage.page:34(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Interneten továbbított csevegés (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 ""
-"Az adatvédelmi mód külső és pontosabb eszközök használata esetén is "
-"bekapcsolva marad."
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button\">A "
+"telepathy-idle telepítése</link>"
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Csak partnerei láthatják földrajzi helyét."
+#: C/irc-manage.page:48(info/title)
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC-csevegőszobák és társalgások"
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "Az <app>Empathy</app> nem teszi közzé a földrajzi helyet."
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Csevegőszobák és társalgások"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "A földrajzi hely nem kerül közzétételre"
+#: C/irc-manage.page:55(info/title)
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Gyakori IRC-problémák"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Védje meg becenevét, hogy más IRC-felhasználók ne használhassák azt."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Jelszó használata IRC becenévhez"
+
+#: 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 ""
-"Ha partnerei nem látják földrajzi helyét, akkor az <app>Empathy</app> lehet, "
-"hogy nem képes elégséges pontossággal meghatározni azt."
+"Egyes IRC-hálózatokon lehetősége van becenevének regisztrálására a NickServ "
+"nevű szolgáltatásnál. A NickServnek küldött speciális üzenetekkel "
+"beállíthatja jelszavát, és azonosíthatja magát. Egyes IRC-csevegőszobák nem "
+"engedik belépni regisztrált becenév nélkül."
 
-#: 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 ""
-"Ebben az esetben az Ön földrajzi helye nem kerül közzétételre, de partnerei "
-"helyét továbbra is látni fogja."
+"Az <app>Empathy</app> jelenleg nem támogatja a becenév regisztrálását. Egyes "
+"IRC-hálózatok azonban automatikusan továbbítanak egy <em>kiszolgálójelszót</"
+"em> a NickServnek. Ezeken a hálózatokon az IRC-jelszavát az <app>Empathy</"
+"app> segítségével használhatja azonosításra a NickServ felé. A népszerű "
+"FreeNode hálózat rendelkezik ezzel a szolgáltatással."
+
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "IRC-kiszolgálójelszó beállítása:"
+
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Válassza ki az IRC-fiókot az ablak bal oldalán lévő listából."
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-nick-password.page:57(item/p)
 msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
-"Ha közzé szeretné tenni földrajzi helyét, akkor megpróbálhat külső eszközt, "
-"például GPS-t  használni."
+"A <gui>Jelszó</gui> mezőben írja be a beceneve regisztrálásához használt "
+"jelszót."
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/irc-nick-password.page:69(note/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."
+"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 ""
-"Földrajzi helyének közzétételéhez az Ön által használt Jabber kiszolgálónak "
-"támogatnia kell a PEP specifikációt. A <link href=\"http://coccinella.im/"
-"servers/servers_by_pubsub_pep.html\">PEP-et támogató kiszolgálók</link> "
-"listája online elérhető. A Google Talk jelenleg nem támogatja ezt a "
-"szolgáltatást."
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "A helymeghatározás megismerése és használata az <app>Empathyban</app>."
-
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Földrajzi hely"
+"Ezek az utasítások csak bizonyos IRC-hálózatokon teszik lehetővé jelszóval "
+"védett becenév használatát. Jelenleg az <app>Empathy</app> használatával nem "
+"lehet IRC-becenevet regisztrálni, vagy a becenév jelszavát módosítani."
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Helymeghatározás"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr ""
+"Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Gyakori problémák javítása"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Fájlok küldése IRC használatával."
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Kedvenc szobák beállítása, kezelése és csatlakozás azokhoz."
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Jelenleg nem lehetséges a fájlok küldése IRC használatával."
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Kedvenc szobák"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Társalgás kezdése IRC-partnerrel."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Szoba beállítása kedvencként"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Csevegjen IRC-n"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Csatlakozás szobához."
+#: 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 ""
+"Személyes társalgást folytathat más IRC-felhasználókkal a nyilvános IRC-"
+"csevegőszobákon kívül. Társalgás kezdeményezéséhez egy másik IRC-"
+"felhasználóval:"
 
-#: 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 ""
-"IRC-szobához csatlakozással kapcsolatos további információkért lásd a <link "
-"xref=\"irc-join-room\"/> oldalt."
+"Egy IRC-csevegőszoba partnerlistájában kattintson duplán a felhasználó "
+"nevére, akivel csevegni szeretne. Ezen kívül rákattinthat a jobb egérgombbal "
+"is a felhasználó nevére, és kiválaszthatja a <gui>Csevegés</gui> menüpontot."
 
-#: 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 ""
-"Csoportos társalgáshoz csatlakozással kapcsolatos további információkért "
-"lásd a <link xref=\"group-conversations\"/> oldalt."
+"Az IRC-szoba partnerlistája nem azonos az <app>Empathy</app> "
+"partnerlistájával. Ez az adott IRC-szoba felhasználóinak listáját "
+"tartalmazza. A különböző szobákban különböző partnerek vannak felsorolva."
 
-#: 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 ""
-"A társalgás ablakban válassza a <guiseq><gui>Társalgás</gui><gui>Kedvenc "
-"csevegőszoba</gui></guiseq> menüpontot."
+"Az IRC-szoba partnerlistája általában az IRC-szoba ablakának jobb oldalán "
+"van. Ha nem látja, akkor válassza a <guiseq><gui>Társalgás</"
+"gui><gui>Partnerlista megjelenítése</gui></guiseq> menüpontot."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Belépés kedvenc szobákba"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Jogi információk."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Nyomja meg az <key>F5</key> billentyűt."
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Licenc"
 
-#: 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 ""
-"Válassza a <guiseq><gui>Szoba</gui><gui>Csatlakozás a kedvencekhez</gui></"
-"guiseq> menüpontot az összes kedvenc szobába való belépéshez."
+"Ez a mű a CreativeCommons Attribution-Share Alike 3.0 Unported licenc "
+"feltételei szerint terjeszthető."
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr ""
-"Válassza a <gui>Szoba</gui> menüpontot, majd a kedvenc szobát, amelybe be "
-"szeretne lépni."
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Jogodban áll:"
+
+#: C/license.page:25(item/title)
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "<em>Megosztani</em>"
+
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Másolni, terjeszteni és továbbítani a művet."
+
+#: C/license.page:29(item/title)
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "<em>Feldolgozni</em>"
+
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Módosítani a művet."
 
-#: C/favorite-rooms.page:90(p)
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "A következő feltételek szerint:"
+
+#: C/license.page:38(item/title)
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "<em>Nevezd meg!</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 ""
-"Kedvenc szobába való belépéshez csatlakozva kell lennie az internethez és "
-"fiókjához."
+"A szerző vagy a jogosult által meghatározott módon fel kell tüntetned a "
+"műhöz kapcsolódó információkat (pl. a szerző nevét vagy álnevét, a Mű címét)."
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Kedvenc szobák kezelése"
+#: C/license.page:46(item/title)
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "<em>�gy add tovább!</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 ""
-"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Szoba</"
-"gui><gui>Kedvencek kezelése</gui></guiseq> menüpontot."
+"Ha megváltoztatod, átalakítod, feldolgozod ezt a művet, az így létrejött "
+"alkotást csak a jelenlegivel megegyező licenc alatt terjesztheted."
 
-#: 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 ""
-"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki azt a fiókot, "
-"amelynek kedvenc szobáit módosítani szeretné."
+"A licenc teljes szövegéért lásd a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/legalcode\">CreativeCommons weboldalát</link>, vagy a "
+"teljes <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons "
+"összefoglalót</link>."
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr ""
-"Válassza az <gui>Összes</gui> lehetőséget az összes kedvenc szoba "
-"megjelenítéséhez."
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Különböző partnerek egyesítése és szétválasztása"
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Válassza ki a kezelni kívánt kedvenc szobát:"
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Partnerek egyesítése és szétválasztása"
 
-#: 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 ""
-"Jelölje be az <gui>Automatikus kapcsolódás</gui> négyzetet a szobába való "
-"automatikus belépéshez a fiókjához kapcsolódáskor."
+"Ha egy partnere több fiókkal is rendelkezik különböző szolgáltatóknál, akkor "
+"ezeket a partnerbejegyzéseket egyesítheti."
 
-#: 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 ""
-"Kattintson az <gui>Eltávolítás</gui> gombra a szoba eltávolításához "
-"kedvencei közül."
+"Az eredményül kapott partnert <em>metapartnernek</em> hívjuk: ez egy több "
+"önálló partnerbejegyzésből álló partner."
 
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Ha befejezte, nyomja meg a <gui>Bezárás</gui> gombot."
+#: C/link-contacts.page:34(page/p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Ha rendelkezik egy Kovács Erzsébet nevű partnerrel, aki három különböző "
+"üzenetküldő szolgáltatást használ:"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "ekovacs@facebook"
+
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "erzsebet.kovacs@gmail"
+
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "erzsebet_kovacs@hotmail"
+
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
 msgstr ""
-"A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
+"Ezeket a partnerbejegyzéseket egyetlen Kovács Erzsébet bejegyzéssé "
+"egyesítheti."
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "Fiók letiltása"
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Partnerek egyesítése"
 
-#: C/disable-account.page:41(p)
+#: 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 ""
-"A fiókok letilthatók, ekkor az <app>Empathy</app> nem fog bejelentkezni, de "
-"a fiók sem kerül eltávolításra. Bizonyos helyzetekben szükség lehet a fiók "
-"letiltására és újraengedélyezésére, ha csak néha szeretne bejelentkezni a "
-"fiókba, de más fiókokhoz továbbra is az <app>Empathyt</app> szeretné "
-"használni."
+"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a különböző "
+"fiókokkal rendelkező partnerére, és válassza a <gui style=\"menuitem"
+"\">Partnerek összekapcsolása…</gui> menüpontot."
 
-#: 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 ""
-"Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
+"A <gui>Partnerek összekapcsolása</gui> ablak bal oldalán válassza ki az "
+"egyesíteni kívánt partnereket."
 
-#: C/disable-account.page:56(p)
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Nyomja meg az <gui style=\"button\">Összekapcsolás</gui> gombot."
+
+#: 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 ""
-"Törölje az <gui style=\"checkbox\">Engedélyezve</gui> négyzetet az ablak "
-"jobb oldalán."
+"Metapartner létrehozása esetén az alapértelmezett partner, amellyel dupla "
+"kattintással társalgást kezdeményez, a leghosszabb online jelenléttel "
+"rendelkező partnerbejegyzés lesz."
 
-#: C/disable-account.page:62(p)
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "Metapartnerek szétválasztása"
+
+#: 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 ""
-"Fiók újraengedélyezéséhez csak válassza ki az <gui style=\"checkbox"
-"\">Engedélyezve</gui> négyzetet."
+"A <gui>Partnerlistában</gui> kattintson a jobb egérgombbal a szétválasztani "
+"kívánt metapartnerre, és válassza a <gui style=\"menuitem\">Partnerek "
+"összekapcsolása</gui> menüpontot."
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Fiók regisztrálása valamelyik támogatott üzenetküldő szolgáltatással."
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">Szétválasztás</gui> gombot."
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Új fiók regisztrálása"
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Böngéssze korábbi társalgásait, vagy keressen bennük."
 
-#: C/create-account.page:36(p)
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Korábbi társalgások megjelenítése"
+
+#: 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 ""
-"A legtöbb fióktípus megköveteli fiók létrehozását egy szolgáltatónál ahhoz, "
-"hogy az <app>Empathyhoz</app> hasonló azonnaliüzenő alkalmazásokkal "
-"csatlakozhatna. Egyes szolgáltatók esetén használhatja az <app>Empathyt</"
-"app> új fiók regisztrálására, a <link xref=\"add-account\">fiók "
-"hozzáadásánál</link> használt lépéseket követve."
+"Az <app>Empathy</app> automatikusan menti az összes szöveges társalgását "
+"partnereivel. Lehetősége van <link xref=\"#search\">keresni az összes "
+"korábbi társalgásában</link>, vagy partner és dátum szerint <link xref="
+"\"#browse\">böngészni a korábbi társalgásokat</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 ""
-"Ez az oldal új fiók létrehozásával kapcsolatos információkat biztosít "
-"különböző fióktípusokhoz. A szolgáltatónak meg kell adnia a bejelentkezési "
-"azonosítót és jelszót, valamint az <app>Empathy</app> használatával való "
-"csatlakozáshoz esetleg szükséges további információkat."
+"A korábbi társalgások megjelenítéséhez és az azokban való kereséshez nem "
+"kell az internethez kapcsolódni."
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Keresés korábbi társalgásokban"
 
-#: 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."
-msgstr ""
-"A Facebook az egyik legtöbbet használt közösségi hálózat. Segítségével a "
-"felhasználók saját profilt hozhatnak létre, és kommunikálhatnak barátaikkal."
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "Teljes szöveges keresést végezhet minden korábbi társalgásban."
 
-#: C/create-account.page:52(p)
+#: 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 ""
-"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 ""
-"A Facebook használatához a <link href=\"http://www.facebook.com\">www."
-"facebook.com</link> weboldalon kell létrehoznia egy új fiókot."
-
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+"A <gui>Partnerlista</gui> ablakban válassza a <guiseq><gui>Nézet</"
+"gui><gui>Korábbi társalgások</gui></guiseq> menüpontot. Az <key>F3</key> "
+"billentyűt is megnyomhatja."
 
-#: C/create-account.page:62(p)
+#: C/prev-conv.page:63(item/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 ""
-"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 ""
-"A Jabber egy nyílt azonnaliüzenő-rendszer. Az e-mailhez hasonlóan a Jabber "
-"lehetővé teszi a szolgáltató megválasztását, és az összes Jabber "
-"felhasználóval való kommunikációt a szolgáltatótól függetlenül."
+"Válassza ki a fiókot a felső legördülő listából. A fiókhoz tartozó "
+"partnerek és csevegőszobák listája alul megjelenik."
 
-#: 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 ""
-"Egy Jabber szolgáltatónál létre kell hoznia az új fiókot. Számos ingyenes "
-"szolgáltató van, az egyik népszerű a <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 "A <gui>Keresés</gui> mezőbe írja be a keresendő szöveget."
 
-#: C/create-account.page:71(p)
+#: C/prev-conv.page:71(item/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."
 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 ""
-"Ha a Google Mail vagy a Google Talk szolgáltatást használja, akkor már van "
-"Jabber fiókja. A Google Talk egy Jabber szolgáltatás. Google Mail címét és "
-"jelszavát használhatja az <app>Empathyban</app> a kapcsolódáshoz."
+"Megjelennek azok a társalgások, amelyekben megtalálható a "
+"keresőkifejezés. A társalgások alapértelmezésben dátum szerint vannak "
+"rendezve."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Közeli emberek"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Korábbi társalgások tallózása"
 
-#: 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 ""
-"Ezen szolgáltatás használatához nem szükséges fiókot létrehoznia egy "
-"szolgáltatónál. A szolgáltatás akkor működik, amikor helyi hálózathoz, "
-"például vezeték nélküli hotspothoz kapcsolódik, és képes automatikusan "
-"megtalálni a szolgáltatás többi felhasználóját az adott hálózaton."
-
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "További információkért lásd a <link xref=\"salut-protocol\"/> oldalt."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+"A partnereivel vagy a csevegőszobákban folytatott korábbi társalgásokat "
+"dátum szerint tallózhatja."
 
-#: 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 ""
-"A SIP egy nyílt rendszer, amely lehetővé teszi felhasználóinak hang- és "
-"videohívások bonyolítását az interneten. Létre kell hoznia egy fiókot egy "
-"SIP-szolgáltatónál. Az összes SIP-felhasználóval kommunikálhat, függetlenül "
-"az általuk használt szolgáltatótól."
+"Válassza ki a fiókot a bal felső legördülő listából. A fiókhoz tartozó "
+"partnerek és csevegőszobák listája alul megjelenik."
 
-#: 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 ""
-"Technikai nehézségek miatt az ingyenes <link href=\"https://www.ekiga.net/"
-"index.php?page=register\">Ekiga.net</link> szolgáltatás jelenleg nem működik "
-"az <app>Empathyval</app>."
+"Válassza ki a partnert vagy csevegőszobát a korábbi társalgások "
+"megjelenítéséhez. Alapértelmezésben a legújabb társalgás jelenik meg."
 
-#: 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 ""
-"Egyes SIP-szolgáltatók lehetővé teszik normál telefonok hívását a "
-"számítógépéről. Az ilyen szolgáltatásra általában elő kell fizetni."
-
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+"A társalgásokat dátum szerint böngészheti. Azok a napok, amelyeken a "
+"kiválasztott partnerrel társalgást folytatott, félkövéren jelennek meg. "
+"Kattintson a dátumra a kiválasztásához. Kattintson a hónap és az év melletti "
+"nyilakra a korábbi dátumok böngészéséhez."
 
-#: C/create-account.page:109(p)
+#: C/prev-conv.page:105(section/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."
 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 ""
-"Az IRC használatához nem kell fiókot regisztrálni. Noha meg kell adnia egy "
-"becenevet az IRC-fiók felvételekor az <app>Empathyba</app>, ez a becenév "
-"csak az egyes csatlakozásokkor jön létre. Ha másik felhasználó használja a "
-"becenevet, akkor újat kell választania."
+"A társalgásokban a felső keresőmezőbe gépelve kereshet szöveget. Ezután az "
+"illeszkedő társalgások megjelennek."
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:111(note/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."
 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 ""
-"Egyes IRC-hálózatok egy NickServ nevű szolgáltatást használnak, amely "
-"lehetővé teszi felhasználóiknak beceneveik megvédését. További "
-"információkért lásd a <link xref=\"irc-nick-password\"/> oldalt."
+"A <gui>Partnerlista</gui> ablakból gyorsan megjelenítheti az egyes "
+"partnereivel folytatott korábbi társalgásait. Csak kattintson a jobb "
+"egérgombbal a partnerre, és válassza a <gui>Korábbi társalgások</gui> "
+"menüpontot. Megnyílik a <gui>Korábbi társalgások</gui> ablak, és az adott "
+"partner lesz kiválasztva."
 
-#: 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 ""
-"Egyes IRC-kiszolgálók jelszóval védettek. Az ilyen kiszolgálókhoz "
-"csatlakozáskor ismernie kell a jelszót. Ezek általában privát IRC-hálózatok."
+"A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Zárt szolgáltatások"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "A fiókom nincs engedélyezve"
 
-#: 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 ""
-"Számos zárt azonnaliüzenő-szolgáltatást fejlesztettek különböző cégek és "
-"szervezetek. Az <app>Empathy</app> lehetővé teszi a kapcsolódást meglévő "
-"fiókjával a legnépszerűbb szolgáltatásokhoz. Új fiók létrehozásához fel kell "
-"keresnie a szolgáltató weboldalát, és el kell fogadnia a felhasználási "
-"feltételeket."
-
-#: 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!"
+"Ha a használni kívánt azonnaliüzenő-fiók nincs engedélyezve a legördülő "
+"fióklistában, amikor új társalgást akar kezdeni vagy be akar lépni egy "
+"csevegőszobába, akkor a fiók adatai hibásak lehetnek."
 
-#: 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 ""
-"Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
+"Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "Módosítsa állapotát"
+#: 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 ""
+"Válassza a <guiseq><gui>Szerkesztés</gui><gui>Fiókok</gui></guiseq> "
+"menüpontot, majd a nem működő fiókot."
 
-#: 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 ""
-"Beállíthatja állapotát az elérhetőségének jelzéséhez partnerei felé. Az "
-"<app>Empathy</app> lehetővé teszi a mentett állapotok listából való "
-"kiválasztását."
+"�rja be újra felhasználónevét és jelszavát, így ellenőrizve hogy nem gépelte "
+"el azokat."
 
-#: 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 ""
-"Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
+"Ellenőrizze a <gui>Speciális</gui> szakaszban, hogy minden adat helyes-e. "
+"Ezeket az adatokat az üzenetküldő szolgáltatás weboldalán találhatja meg."
 
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "Válasszon egy állapotot a listából."
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Ellenőrizze, hogy a fiók be van-e kapcsolva."
 
-#: 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 ""
-"A beépített állapotok listájával és jelentésével kapcsolatban lásd az <link "
-"xref=\"status-icons\"/> oldalt. Felvehet <link xref=\"set-custom-message"
-"\">egyéni állapotüzeneteket</link> további információk közléséhez "
-"partnereivel az elérhetőségéről."
+"A főablakban az „<gui>A hitelesítés meghiúsult</gui>� üzenet jelenik meg."
 
-#: C/change-status.page:58(p)
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Az „A hitelesítés meghiúsult� üzenetet kapom"
+
+#: 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 ""
-"Ha egy ideig nem használja a számítógépet, vagy a képernyővédő bekapcsol, az "
-"állapot automatikusan „Távol� lesz."
+"Ez a hiba akkor következik be, ha az azonnaliüzenő-szolgáltatás nem "
+"engedélyezi a csatlakozást, mert valamiért nem ismeri fel az Ön "
+"felhasználónevét vagy jelszavát."
 
-#. 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"
+"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 ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Győződjön meg róla, hogy már regisztrált fiókot annál a szolgáltatásnál, "
+"amelyhez csatlakozni próbál. Ha nincs fiókja, a legtöbb szolgáltatás nem "
+"engedélyezi a csatlakozást."
 
-#: 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."
-msgstr "Információk arról, hogy mikor kezdhet hang- vagy videohívást."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Hang- és videotámogatás"
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
+msgstr ""
+"Kattintson a hibaüzenetben a <media type=\"image\" mime=\"image/png\" src="
+"\"figures/gtk-edit.png\">Szerkesztés</media> ikonra."
 
-#: 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 ""
-"Csak olyan partnerekkel folytathat hang- és videohívást, akik maguk is ezt a "
-"szolgáltatást támogató klienst használnak. Ha a partner kliense támogatja a "
-"hang- vagy videohívást, akkor a partnerlistában a neve mellett a következő "
-"ikont láthatja:"
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Ikon"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Leírás"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Hanghívások ikonja"
+"Törölje az <gui>Engedélyezett</gui> jelölését, majd jelölje be újra a "
+"szolgáltatáshoz való ismételt csatlakozás megpróbálásához."
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "A partner képes hanghívás fogadására."
+#: C/prob-conn-name.page:9(info/title)
+#| msgid "“Name in use�"
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "„A név használatban�"
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Videohívások ikonja"
+#: 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 "A főablakban az „<gui>A név használatban</gui>� üzenet jelenik meg."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "A partner képes videohívás fogadására."
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Az „A név használatban� üzenetet kapom"
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-name.page:35(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."
+"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 ""
-"Hanghíváshoz az operációs rendszer által támogatott hangkártyára, és működő "
-"mikrofonra van szüksége."
+"Ez a hiba akkor következik be, ha az IRC-fiókjához próbál csatlakozni, és "
+"olyan becenevet használ, amit az adott hálózaton már valaki más használ."
+
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "A <gui>Becenév</gui> szövegdobozban adjon meg egy új becenevet."
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-name.page:56(item/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."
+"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 ""
-"Videohíváshoz az operációs rendszer által támogatott webkamerára, és működő "
-"mikrofonra van szüksége."
-
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Támogatott fióktípusok"
+"Ha regisztrálta a becenevet az éppen használt hálózaton, akkor adja meg a "
+"jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-"
+"nick-password\"/> részt."
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+#| msgid ""
+#| "Deselect the <gui>Enabled</gui>, and then select it again to try to "
+#| "reconnect to the service."
 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."
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
 msgstr ""
-"Csak bizonyos támogatott szolgáltatások fiókjainak használatakor van "
-"lehetősége hang- és videohívásokra. A következő táblázat felsorolja, hogy a "
-"hang és videó támogatott-e az egyes fióktípusokban."
+"Kapcsolja ki, majd újra be a fiókot a szolgáltatáshoz való ismételt "
+"csatlakozás megpróbálásához."
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-neterror.page:7(info/desc)
 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 ""
-"A fióktípusokat bővítmények biztosítják. Rendszerén lehet, hogy a következő "
-"típusok nem mindegyike érhető el, de rendelkezhet itt fel nem sorolt "
-"típusokkal is. A frissített bővítmények lehetővé tehetik a hang- és "
-"videohívásokat az itt nem támogatottként felsorolt fióktípusokkal."
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
+msgstr "A főablakban a „<gui>Hálózati hiba</gui>� üzenet jelenik meg."
+
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "A „Hálózati hiba� üzenetet kapom"
 
-#: C/audio-video.page:110(p)
+#: C/prob-conn-neterror.page:42(page/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."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 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."
+"Ez a hiba akkor következik be, ha az <app>Empathy</app> valamilyen okból nem "
+"tud kommunikálni az azonnaliüzenő-szolgáltatással."
 
-#: C/audio-video.page:118(p)
+#: C/prob-conn-neterror.page:46(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."
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
 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."
-
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Szolgáltatás"
-
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Hang"
+"Ez a hiba következik be akkor is, ha becenév megadása nélkül próbál IRC-"
+"fiókot használni."
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Videó"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Proxytámogatás"
 
-#: 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 "Nem"
+#: 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 ""
+"Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook csevegés"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Üzenetküldő-szolgáltatásokhoz való kapcsolódás általános problémáinak "
+"felismerése."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "Gadu-Gadu"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Azonnaliüzenet-küldő szolgáltatásokhoz kapcsolódás problémái"
 
-#: 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 "Fiók teljes eltávolítása az <app>Empathyból</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 "Igen"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Fiók eltávolítása"
 
-#: 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 ""
+"Ha egy fiókot már nem kíván használni, teljesen eltávolíthatja azt az "
+"<app>Empathyból</app>. Ha a fiókot később újra használni szeretné az "
+"<app>Empathyban</app>, akkor újra meg kell adnia a fiók részleteit."
 
-#: 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 ""
+"Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "QQ"
+#: C/remove-account.page:51(item/p)
+#| msgid "Click <gui style=\"button\">Add</gui>."
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Nyomja meg a <gui style=\"button\">-</gui> gombot."
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "Sametime"
-
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "Silc"
+#: 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 ""
+"Megjelenik egy megerősítést kérő ablak. Kattintson az <gui>Eltávolítás</gui> "
+"gombra a fiók végleges eltávolításához."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "Zephyr"
+#: 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 ""
+"Az <app>Empathy</app> még a fiók eltávolítása után sem törli a fiókhoz "
+"tartozó csevegéselőzményeket."
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Hívja fel partnereit az interneten."
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "A Közeli emberek szolgáltatás bemutatása."
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Hanghívás kezdeményezése"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Mi az a Közeli emberek?"
 
-#: C/audio-call.page:29(p)
+#: C/salut-protocol.page:40(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."
+"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 ""
-"Felhívhatja partnereit, és beszélgethet velük. Ez a szolgáltatás csak "
-"bizonyos fióktípusokkal működik, és a másik személynek is a hanghívásokat "
-"támogató alkalmazást kell használnia."
+"A Közeli emberek egy kiszolgáló nélküli kommunikációs szolgáltatás: "
+"használatához nincs szükség központi kiszolgálóhoz való csatlakozásra és "
+"bejelentkezésre."
 
-#: C/audio-call.page:34(p)
+#: C/salut-protocol.page:45(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>."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
-"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
-"\">Hanghívás</gui> lehetőséget."
+"Ez a fajta kiszolgáló nélküli üzenetküldő rendszer a helyi hálózatra van "
+"korlátozva, és használatához nincs szükség internetkapcsolatra."
 
-#: C/audio-call.page:55(p)
+#: C/salut-protocol.page:49(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>."
+"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 ""
-"Hanghívás videohívássá változtatásához válassza a <guiseq><gui style=\"menu"
-"\">Videó</gui><gui style=\"menuitem\">Videó be</gui></guiseq> menüpontot."
-
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Hanghívás indítása metapartnerrel"
+"Az azonos helyi hálózaton ezt a szolgáltatást használó embereket a program "
+"automatikusan megtalálja, és ugyanúgy küldhet nekik üzeneteket és fájlokat, "
+"mint más szolgáltatások esetén."
 
-#: C/audio-call.page:71(p)
+#: C/salut-protocol.page:54(page/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"Válassza ki a felhívni kívánt partnert, majd a menüből a <gui style="
-"\"menuitem\">Hanghívás</gui> menüpontot."
+"Ezt a szolgáltatástípust minden korszerű helyi hálózatnak tudnia kell "
+"támogatni."
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "A partnerlista bővítése."
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Fájl küldése a számítógépéről egy partnerének."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Egy személy felvétele a partnerlistájára"
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Fájlok küldése"
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+#: C/send-file.page:45(item/p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Válassza a <guiseq><gui>Csevegés</gui><gui>Partner felvétele</gui></guiseq> "
-"menüpontot."
+"Kattintson a jobb egérgombbal a partnerre, akinek fájlt szeretne küldeni, és "
+"válassza a <gui>Fájl küldése</gui> menüpontot."
 
-#: C/add-contact.page:40(p)
+#: 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 ""
-"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."
+"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 ""
-"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki a "
-"csatlakozáshoz használandó fiókot. A partnerének az itt kiválasztott "
-"fiókéval egyező szolgáltatást kell használnia."
+"Kattintson a partnerre, akinek fájlt szeretne küldeni, majd válassza a "
+"<guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Fájl küldése</gui></"
+"guiseq> menüpontot."
 
-#: C/add-contact.page:45(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."
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
 msgstr ""
-"Az <gui>Azonosító</gui> mezőben adja meg partnere bejelentkezési "
-"azonosítóját, felhasználónevét, becenevét, vagy a szolgáltatástípushoz "
-"megfelelő egyéb azonosítóját."
+"Válassza ki az elküldeni kívánt fájlt, és kattintson a <gui>Küldés</gui> "
+"gombra."
 
-#: C/add-contact.page:49(p)
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Megjelenik a <gui>Fájlátvitelek</gui> ablak."
+
+#: C/send-file.page:66(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."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"Az <gui>�lnév</gui> mezőben adja meg a partner nevét, ahogyan azt a "
-"partnerlistában szeretné látni."
+"Várjon, amíg partnere elfogadja a fájlátvitelt, vagy kattintson a "
+"<gui>Leállítás</gui> gombra az átvitel leállításához."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+#: 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 ""
-"Kattintson a <gui>Hozzáadás</gui> gombra a személy felvételéhez a "
-"partnerlistájára."
+"Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
 
-#: C/add-contact.page:61(p)
+#: C/send-file.page:80(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."
+"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 ""
-"Új személy partnerlistára való felvételéhez csatlakoznia kell az internethez "
-"és fiókjához."
-
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Új fiók felvétele az <app>Empathyba</app>."
-
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "Új fiók hozzáadása"
+"Ha az ablakban több befejeződött átvitel is fel van sorolva, akkor "
+"kattintson a <gui>Törlés</gui> gombra a lista kiürítéséhez. Ez a fájlokat "
+"csak a listából törli, a számítógépéről nem."
 
-#: C/add-account.page:41(p)
+#: C/send-file.page:87(note/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\"/>."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"Az <app>Empathyba</app> bármely támogatott szolgáltatás azonnaliüzenő-"
-"fiókjait felveheti, hogy kommunikálhasson partnereivel. Egyes szolgáltatók "
-"esetén ezekkel a lépésekkel egy új fiók regisztrálását is elvégezheti. "
-"További részletekért lásd az <link xref=\"create-account\"/> oldalt."
-
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Nyomja meg a <gui style=\"button\">Hozzáadás</gui> gombot."
+"Fájlok küldése csak a következő szolgáltatások használatával lehetséges: "
+"<em>Jabber</em>, <em>Google Talk</em> és <em>Közeli emberek</em>."
 
-#: C/add-account.page:57(p)
+#: C/send-file.page:93(note/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
 msgstr ""
-"A <gui>Protokoll</gui> legördülő listából válassza ki a felvenni kívánt fiók "
-"típusát."
+"Ahhoz, hogy valakinek fájlt tudjon küldeni, csatlakoznia kell az "
+"internethez, vagy helyi hálózathoz."
 
-#: C/add-account.page:61(p)
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Üzenet küldése egyik partnerének."
+
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Üzenetek küldése"
+
+#: C/send-message.page:36(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."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr ""
-"Ha még nincs regisztrált fiókja, válassza az <gui>Új fiók létrehozása a "
-"kiszolgálón</gui> lehetőséget. Ez a szolgáltatás nem érhető el minden "
-"fióktípushoz, és egyes szolgáltatók esetén lehet hogy nem működik. További "
-"információkért lásd az <link xref=\"create-account\"/> oldalt."
+"A <gui>Partnerlista</gui> ablakban kattintson duplán azon partner nevére, "
+"akivel csevegni szeretne."
 
-#: C/add-account.page:66(p)
+#: C/send-message.page:42(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."
+"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 ""
-"Adja meg a szükséges információkat. A legtöbb fiókhoz csak egy "
-"bejelentkezési azonosító és jelszó kell. Egyes fiókok további információkat "
-"igényelhetnek, lásd: <link xref=\"accounts-window#details\"/>."
+"Megnyílik egy új ablak. �rja be az üzenetet az ablak alján lévő "
+"szövegmezőbe, és nyomja meg az <key>Enter</key> billentyűt az elküldéséhez."
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Nyomja meg a <gui style=\"button\">Bejelentkezés</gui> gombot."
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Üzenet küldése metapartnernek"
 
-#: C/add-account.page:78(p)
+#: C/send-message.page:58(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."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"A fiókot a <gui>Fiókok</gui> ablakban azonosító név módosításához válassza "
-"ki a fiókot a bal oldali listából, és kattintson a nevére, vagy nyomja meg a "
-"szóköz billentyűt. Módosítsa a fiók nevét, és nyomja meg az <key>Enter</key> "
-"billentyűt ha befejezte."
+"Válassza ki a partnert, akivel csevegni szeretne, és a menüből válassza a "
+"<gui style=\"menuitem\">Csevegés</gui> pontot."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Fiókok hozzáadása, módosítása és törlése."
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Személyes állapotüzenetek hozzáadása, szerkesztése vagy törlése."
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Fiókok ablak"
+#: 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 "Egyéni üzenet beállítása"
 
-#: 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 ""
-"A <gui>Fiókok</gui> ablak lehetővé teszi fiókok hozzáadását, módosítását és "
-"törlését."
-
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Fiók részletei"
+"Egyes esetekben szüksége lehet egyéni állapotüzenet beállítására, például "
+"közölni ismerőseivel, hogy egy ideig nem lesz elérhető."
 
-#: 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 ""
-"A legtöbb fióktípushoz csak a bejelentkezési azonosítót és a jelszót kell "
-"megadnia. Bizonyos fiókok vagy fióktípusok azonban további információkat is "
-"igényelhetnek."
-
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Speciális beállítások Jabber és Google Talk fiókokhoz."
-
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Jabber fiókok részletei"
+"A különböző elérhető állapotok alapján lehetőség van egyéni üzenet "
+"beállítására."
 
-#: 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 ""
-"A legtöbb Jabber fiók csak bejelentkezési azonosítót és jelszót igényel a "
-"csatlakozáshoz. Egyes fiókokhoz, vagy bizonyos hálózattípusokon további "
-"információk megadására lehet szükség a <gui>Speciális</gui> szakaszban. "
-"�ltalában nincs szükség a lentebbi speciális beállítások használatára. Fiók "
-"hozzáadásával kapcsolatban lásd az <link xref=\"add-account\"/> oldalt."
+"A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
 
-#: 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 ""
-"A Google Talk a Jabber fiókok egy fajtája. Ezek az utasítások Google Talk "
-"fiókokra is érvényesek."
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Titkosítás szükséges (TLS/SSL)"
+"�llítsa be azt az állapotot, amelyhez az egyéni üzenetet meg kívánja adni. "
+"Az <gui>Egyéni üzenet</gui> címkével jelöltet válassza."
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "SSL-tanúsítványhibák figyelmen kívül hagyása"
+#: 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 ""
+"Adja meg egyéni üzenetét az ablak tetején lévő szövegdobozba, és nyomja meg "
+"az <key>Enter</key> billentyűt az üzenet beállításához."
 
-#: C/account-jabber.page:47(p)
+#: 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 star on the right of the text box "
+#| "where you wrote your custom message."
 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 ""
-"Amikor csak lehetséges, az <app>Empathy</app> és a Jabber kiszolgáló közötti "
-"kommunikáció titkosított. Ha a titkosított kommunikáció nem lehetséges, az "
-"üzenetek titkosítatlanul kerülhetnek elküldésre. Válassza ki a "
-"<gui>Titkosítás szükséges</gui> négyzetet a Jabber kiszolgálóval való "
-"kommunikáció megtiltásához az <app>Empathynak</app>, ha a titkosítás nem "
-"lehetséges."
+"Ha az egyéni üzenetet szeretné kedvencként beállítani, így elmentve az "
+"ismételt felhasználáshoz, akkor kattintson az egyéni üzenetet tartalmazó "
+"szövegdoboz jobb oldalán lévő kis szívre."
 
-#: 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 ""
-"Egyes Jabber kiszolgálók az adatokat érvénytelen, vagy ismeretlen "
-"hitelesítésszolgáltatóktól származó tanúsítványokkal titkosíthatják. Ha "
-"megbízik a kiszolgálóban, amelyhez csatlakozik, akkor kiválaszthatja az "
-"<gui>SSL-tanúsítványhibák figyelmen kívül hagyása</gui> négyzetet az "
-"érvénytelen tanúsítvánnyal történő titkosított kommunikáció engedélyezéséhez."
+"Ha ezt nem teszi meg, akkor az egyéni üzenet nem lesz elérhető az "
+"<app>Empathy</app> következő használatakor. Az üzenet alapértelmezésben csak "
+"az aktuális munkamenetben marad meg."
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Erőforrás"
+#: C/set-custom-status.page:78(section/title)
+#| msgid "To remove a custom message:"
+msgid "Edit and remove a custom message"
+msgstr "Egyéni üzenet szerkesztése és eltávolítása"
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioritás"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Válassza az <gui>Egyéni üzenetek szerkesztése</gui> lehetőséget."
+
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Egyéni üzenet szerkesztéséhez:"
 
-#: 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 ""
-"Ha több alkalmazással (például más számítógépekről) kapcsolódik egyidejűleg "
-"fiókjához, akkor beállíthat egy erőforrást ezek egyedi azonosításához. "
-"Alapértelmezésben az <app>Empathy</app> erőforrásként a <input>Telepathy</"
-"input> értéket használja."
+"A <gui>Mentett érték</gui> dobozból válassza ki a szerkeszteni kívánt "
+"állapotüzenetet, és kattintson rá duplán."
 
-#: 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 ""
-"Beállíthatja a prioritást annak megadásához, hogy melyik alkalmazás kapja "
-"partnereitől a bejövő üzeneteket. Az új üzenetek a legmagasabb prioritású "
-"alkalmazásnak kerülnek elküldésre."
+"�rja be az új egyéni üzenetet, és nyomja meg az <key>Enter</key> billentyűt "
+"a módosításához."
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Kiszolgáló beállításainak felülbírálása"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Egyéni üzenet eltávolításához:"
 
-#: 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 ""
-"Az <app>Empathy</app> az alapértelmezett beállításokat használja a Jabber "
-"kiszolgálóhoz való kapcsolódáshoz a bejelentkezési azonosítója alapján. "
-"Egyes Jabber kiszolgálókhoz saját kezűleg kell egyéni "
-"kiszolgálóbeállításokat megadnia. Ezeket a beállításokat a Jabber "
-"szolgáltatója biztosítja."
+"A <gui>Mentett érték</gui> dobozból válassza ki az eltávolítani kívánt "
+"állapotüzenetet."
 
-#. 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 "Kattintson az <gui>Eltávolítás</gui> gombra."
 
-#. 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 "Ha elkészült, kattintson a <gui>Bezárás</gui> gombra."
+
+#: C/set-custom-status.page:140(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."
+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"
+"Egyéni üzenet szerkesztésekor az nem kerül beállításra "
+"aktuális állapotüzenetként. Ehhez ki kell választania azt a "
+"<gui>Partnerlista</gui> ablakban."
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "IRC-hálózatokhoz való csatlakozáshoz szükséges további információk"
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Asztalának megmutatása partnereinek."
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "IRC-fiók részletei"
+#: 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 "Asztal megosztása"
 
-#: 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 ""
-"Az IRC-fiókok sok más fióktípustól eltérő információkat igényelnek. IRC-fiók "
-"létrehozásához meg kell adnia legalább az IRC-hálózatot és egy becenevet. Ez "
-"az oldal részletesen leírja az IRC-fiókhoz megadható információkat."
-
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Hálózat"
+"Egyes partnereivel megoszthatja asztalát, vagy elkezdheti használni az "
+"övéket. Ezt a funkciót asztala partnereinek való megmutatására használhatja, "
+"így például segítséget kérhet, vagy segíthet nekik megoldani egy problémát."
 
-#: 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 ""
-"Az IRC egy nyílt rendszer, amely lehetővé teszi független IRC-hálózatok "
-"futtatását. Az egyes hálózatok egyediek, és saját felhasználókkal és "
-"csevegőszobákkal rendelkeznek. Az <app>Empathy</app> a <gui>Hálózat</gui> "
-"legördülő listában felsorolja a legnépszerűbb hálózatokat. Ezen kívül "
-"továbbiakat is felvehet. Részletekért lásd a <link xref=\"#networks\"/> "
-"részt lentebb."
+"Asztalának megosztásához rendszerére telepítve kell lennie egy VNC-"
+"kiszolgálónak, amely támogatja ezt a szolgáltatást. A <app>Vino</app>, a "
+"GNOME VNC-kiszolgálója tartalmazza a szükséges támogatást."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Becenév"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "A <gui>Partnerlista</gui> ablakban tegye a következők egyikét:"
 
-#: 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 ""
-"Beceneve az Ön egyedi neve az IRC-hálózaton. A hálózaton csak egy személy "
-"rendelkezhet egy adott becenévvel. Ha az <link xref=\"prob-conn-name\" role="
-"\"error-msg\"/> hibaüzenetet kapja, akkor módosítania kell becenevét."
+"Válassza ki a partnert, akivel meg szeretné osztani az asztalát, és válassza "
+"a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Az asztalom "
+"megosztása</gui></guiseq> menüpontot."
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Jelszó"
+#: 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 ""
+"Kattintson a jobb egérgombbal a partner nevére, akivel meg szeretné osztani "
+"az asztalát, és válassza <gui>Az asztalom megosztása</gui> menüpontot."
 
-#: 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 ""
-"Egyes kiszolgálók, különösen a magánhálózatokon lévők, jelszót igényelnek a "
-"csatlakozáshoz. Ha jogosult a hálózat használatára, akkor a hálózat "
-"rendszergazdái megadják a jelszót."
+"A kiválasztott partner kap egy meghívást az asztala megjelenítésére. Az "
+"asztal megjelenítéséhez ezt a partnernek el kell fogadnia."
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "NickServ jelszavak"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr ""
+"A partnerét az asztal megosztására használt alkalmazás segítségével "
+"választhatja le a számítógépéről."
 
-#: 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 ""
-"Egyes hálózatokon a becenevek regisztrálhatók a NickServ néven ismert "
-"szolgáltatással. Az <app>Empathy</app> közvetlenül nem támogatja a becenevek "
-"jelszavait. Egyes hálózatokon, beleértve a népszerű FreeNode-ot, a "
-"kiszolgálójelszavak automatikusan továbbításra kerülnek a NickServnek, így "
-"ezen mező beállításával azonosíthatja magát a NickServ felé. További "
-"részletekért lásd a <link xref=\"irc-nick-password\"/> oldalt."
+"A távoliasztal-megosztó alkalmazás használatával kapcsolatos további "
+"információkért nézze meg annak súgóját."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Valódi név"
+#: 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 ""
+"Amikor megosztja asztalát, a rendszer teljesítményének romlását és az "
+"internetkapcsolat lassulását tapasztalhatja."
 
-#: 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 ""
-"Beceneve mellett megadhatja valódi nevét is. Más felhasználók láthatják ezt "
-"az Ön információinak megjelenítésekor."
+"Egyes partnerek lehet, hogy nem tudják ezt a szolgáltatást használni. Ehhez "
+"a rendszerükre az <app>Empathy</app> és egy kompatibilis távoliasztal-"
+"megjelenítő 2.28-as vagy újabb verziójának kell telepítve lennie."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Kilépési üzenet"
+#. 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 ""
-"Amikor kilép, egy kilépési üzenet kerül elküldésre minden csevegőszobába, "
-"amelyben jelen van, és minden felhasználónak, akivel éppen társalog. Ebben a "
-"mezőben megadhat egy egyéni kilépési üzenetet."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "IRC-hálózatok"
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "A különböző állapotok és állapotikonok ismertetése."
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Hálózatok"
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "�llapottípusok és ikonok"
 
-#: 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 ""
-"Az <app>Empathy</app> tartalmazza a népszerű IRC-hálózatok listáját. Ha "
-"másik IRC-hálózathoz szeretne csatlakozni, akkor hozzá kell adnia a "
-"listához. A hálózatokat módosíthatja is, és a listából is eltávolíthatja "
-"azokat."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">"
+"Elérhető ikon</media> <gui>Elérhető</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 ""
-"Hálózat listához adásához nyomja meg a <media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Hozzáadás</media> "
-"gombot."
+"Az <em>Elérhető</em> állapottal jelezheti, hogy a számítógépénél van, és "
+"ráér partnereivel csevegni. Ehhez az állapothoz beállíthat egyéni üzenetet."
 
-#: 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 ""
-"A módosításhoz válassza ki a hálózatot, és nyomja meg a <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16"
-"\">Szerkesztés</media> gombot."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Elfoglalt "
+"ikon</media> <gui>Elfoglalt</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 ""
-"Az eltávolításhoz válassza ki a hálózatot, és nyomja meg a <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">z Eltávolítás</media> gombot."
+"Az <em>Elfoglalt</em> állapottal hozhatja partnerei tudomására, hogy éppen "
+"nem szeretne csevegni velük. Ennek ellenére felvehetik Önnel a kapcsolatot, "
+"ha valami igazán sürgős megbeszélnivalójuk van. Alapértelmezésben az "
+"<app>Empathy</app> értesítési buborékokat és hangokat használ, ha Ön "
+"elfoglalt. Ehhez az állapothoz beállíthat egyéni üzenetet."
 
-#: 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 ""
-"Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
-"meg:"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Távol "
+"ikon</media> <gui>Távol</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 ""
-"Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
+"A <em>Távol</em> állapotot akkor használja, ha eltávolodik számítógépétől. "
+"Az <app>Empathy</app> automatikusan Távolra állítja állapotát, ha egy ideig "
+"nem használja számítógépét, vagy a képernyővédő aktiválódik. "
+"Alapértelmezésben az <app>Empathy</app> nem használ értesítő buborékokat és "
+"hangokat, ha Ön távol van. Ehhez az állapothoz beállíthat egyéni üzenetet."
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Karakterkészlet"
+#: 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\">"
+"Láthatatlan ikon</media> <gui>Láthatatlan</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 ""
-"Itt megadhatja a hálózaton általában használt karakterkódolást. A "
-"karakterkódolás a karakterek egy adott, számítógépen belüli tárolási módja. "
-"Számos karakterkódolás van, és az üzenetek megfelelő megjelenítéséhez "
-"ugyanazt a karakterkódolást kell használnia, mint a többi felhasználó."
+"Amikor állapotát <em>Láthatatlanra</em> állítja, partnerei számára "
+"kilépettként jelenik meg. Fiókjaihoz ekkor is csatlakozni fog, láthatja "
+"partnerei állapotát, és társalgásokat indíthat velük."
 
-#. 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 ""
-"Alapértelmezésben az <app>Empathy</app> az UTF-8-at használja, ez a modern "
-"karakterkódolás képes a világ sok nyelvének kezelésére, így a magyaréra is. "
-"A magyar nyelv gyakori kódolása még az ISO-8859-2."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">"
+"Kilépett ikon</media> <gui>Kilépett</gui>"
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Kiszolgálók"
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr ""
+"�llapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Videobeszélgetés kezdése egyik partnerével."
+
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "Videobeszélgetés kezdése"
+
+#: C/video-call.page:31(page/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."
 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 ""
-"Az IRC-hálózat több kiszolgálóval rendelkezhet. Ha egy adott hálózat egy "
-"kiszolgálójához csatlakozik, a hálózat többi kiszolgálójához csatlakozó "
-"összes felhasználóval is képes kommunikálni. A hálózathoz a <gui>Hozzáadás</"
-"gui> gombbal vehet fel kiszolgálókat, és az <gui>Eltávolítás</gui> gombbal "
-"törölheti azokat."
+"Ha rendelkezik webkamerával, akkor felhívhatja partnereit, és "
+"videobeszélgetést folytathat velük. Ez a szolgáltatás csak bizonyos "
+"fióktípusokkal működik, és a másik félnek is rendelkeznie kell a videohívást "
+"támogató alkalmazással."
 
-#: 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 ""
-"Amikor egy kiszolgáló ki van választva, kattintson a <gui>Kiszolgáló</gui> "
-"vagy a <gui>Port</gui> alatti mezőre annak szerkesztéséhez. Ennek "
-"alternatívájaként a balra és jobbra nyilakkal is átviheti a fókuszt a mezők "
-"közt, és a szóköz megnyomásával szerkesztheti azokat."
+"A <gui>Partnerlista</gui> ablakban kattintson a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">videohívás</media> ikonra a "
+"felhívni kívánt partner neve mellett, és válassza a <gui style=\"menuitem"
+"\">Videohívás</gui> menüpontot."
 
-#: 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 ""
-"Jelölje be az <gui>SSL</gui> oszlop alatti jelölőnégyzetet a kiszolgálóval "
-"történő összes kommunikáció titkosításához. Ne feledje, hogy ez nem "
-"akadályoz meg senkit a hálózaton a nyilvános csevegőszobákba írt szavai "
-"elolvasásában."
+"Videobeszélgetés hangbeszélgetéssé alakításához válassza a <guiseq><gui "
+"style=\"menu\">Videó</gui><gui style=\"menuitem\">Videó ki</gui></guiseq> "
+"menüpontot."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-msgstr "Kelemen Gábor <kelemeng at gnome dot hu>"
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Videobeszélgetés indítása metapartnerrel"
+
+#: 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 ""
+"Válassza ki a partnert, akivel beszélgetni szeretne, és a menüből válassza a "
+"<gui style=\"menuitem\">Videohívás</gui> lehetőséget."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "Elérhető ikon"
+
+#~ msgid "Available"
+#~ msgstr "Elérhető"
+
+#~ msgid "Busy icon"
+#~ msgstr "Elfoglalt ikon"
+
+#~ msgid "Busy"
+#~ msgstr "Elfoglalt"
+
+#~ msgid "Away icon"
+#~ msgstr "Távol ikon"
+
+#~ msgid "Away"
+#~ msgstr "Távol"
+
+#~ msgid "Offline icon"
+#~ msgstr "Kilépett ikon"
+
+#~ msgid "Invisible"
+#~ msgstr "Láthatatlan"
+
+#~ msgid "Offline"
+#~ msgstr "Kilépett"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "Egyéni üzenet szerkesztése, eltávolítása és hozzáadása"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr ""
+#~ "Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr ""
+#~ "Kattintson a legördülő listára azon állapot kiválasztásához, amelyhez új "
+#~ "egyéni üzenetet kíván megadni."
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr "Kattintson a szövegdobozba, és írja be az új egyéni üzenetet."
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr ""
+#~ "Kattintson a <gui>Hozzáadás</gui> gombra az új üzenet felvételéhez a "
+#~ "Mentett értékek közé."
+
+#~ 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 "Click on <gui style=\"button\">Remove</gui>."
+#~ msgstr "Kattintson az <gui style=\"button\">Eltávolítás</gui> gombra."
+
+#~ 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 no longer allows you to create an IRC account without a valid "
+#~ "nick. I've removed the guide link. Remove the text."
+
+#~ 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."
+#~ msgstr ""
+#~ "Törölje az <gui>Engedélyezett</gui> négyzet jelölését a fiók neve "
+#~ "mellett, majd jelölje be újra a szolgáltatáshoz való ismételt csatlakozás "
+#~ "megpróbálásához."
+
+#~ 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."
+#~ msgstr ""
+#~ "Ellenőrizze, hogy az <gui style=\"checkbox\">Engedélyezve</gui> "
+#~ "jelölőnégyzet be van-e jelölve. Ha nincs, akkor jelölje be a négyzetet a "
+#~ "fiók engedélyezéséhez."
+
+#~ 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."
+#~ 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."
+
+#~ msgid "Select the <gui>Search</gui> tab."
+#~ msgstr "Válassza a <gui>Keresés</gui> lapot."
+
+#~ msgid ""
+#~ "In the <gui>For</gui> field, type the text you want to search for. Click "
+#~ "<gui>Find</gui> or press <key>Enter</key>."
+#~ msgstr ""
+#~ "Az <gui>Erre</gui> mezőbe írja be a keresendő szöveget. Nyomja meg a "
+#~ "<gui>Keresés</gui> gombot, vagy az <key>Enter</key> billentyűt."
+
+#~ msgid ""
+#~ "Click on a conversation to view it. <app>Empathy</app> will select the "
+#~ "text in the conversation that matched your search terms."
+#~ msgstr ""
+#~ "Kattintson a társalgásra a megjelenítéséhez. Az <app>Empathy</app> "
+#~ "kijelöli a keresőkifejezésre illeszkedő részt a társalgás szövegében."
+
+#~ msgid "Select the <gui>Conversations</gui> tab."
+#~ msgstr "Válassza a <gui>Társalgások</gui> lapot."
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "A telepathy-idle telepítése"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid ""
+#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+#~ "window."
+#~ msgstr ""
+#~ "Törölje az <gui style=\"checkbox\">Engedélyezve</gui> négyzetet az ablak "
+#~ "jobb oldalán."
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "Hanghívások ikonja"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "Videohívások ikonja"
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Click <gui style=\"button\">Log in</gui>."
+#~ msgstr "Nyomja meg a <gui style=\"button\">Bejelentkezés</gui> gombot."
+
+#~ msgid "Resource"
+#~ msgstr "Erőforrás"
+
+#~ msgid "Priority"
+#~ msgstr "Prioritás"
+
+#~ msgid "Network"
+#~ msgstr "Hálózat"
+
+#~ msgid "Nickname"
+#~ msgstr "Becenév"
+
+#~ msgid "Password"
+#~ msgstr "Jelszó"
+
+#~ msgid "Quit message"
+#~ msgstr "Kilépési üzenet"
+
+#~ msgid "Charset"
+#~ msgstr "Karakterkészlet"
+
+#~ msgid "Servers"
+#~ msgstr "Kiszolgálók"
 
 #~ msgid ""
 #~ "In order to be able to share your desktop or to remotely use your "
diff --git a/help/it/it.po b/help/it/it.po
index b1fdecba2..83d3db107 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -3022,7 +3022,7 @@ msgstr ""
 "Dalla finestra <gui>Elenco contatti</gui>, fare clic sull'icona <media type="
 "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">della chiamata "
 "video</media> a fianco del nome del contatto da chiamare e scegliere <gui "
-"style=\"menuitem>Chiamata video</gui>."
+"style=\"menuitem\">Chiamata video</gui>."
 
 #: C/audio-call.page:55(p)
 #| msgid ""
diff --git a/help/lv/lv.po b/help/lv/lv.po
new file mode 100644
index 000000000..8efa301ca
--- /dev/null
+++ b/help/lv/lv.po
@@ -0,0 +1,3581 @@
+# Latvian translation for empathy.
+# Copyright (C) 2012 empathy's COPYRIGHT HOLDER
+# This file is distributed under the same license as the empathy package.
+#
+# Viesturs Ruž�ns <viesty@exs.lv> 2011.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: empathy master\n"
+"POT-Creation-Date: 2012-03-11 22:03+0000\n"
+"PO-Revision-Date: 2012-03-12 00:17+0200\n"
+"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+"Language: lv\n"
+"X-Generator: Lokalize 1.2\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Viesturs Ruž�ns <viesty@exs.lv> 2011\n"
+"RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>"
+
+#. 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 ""
+"external ref='figures/empathy-logo.png' "
+"md5='1afc419a644e90b16393807e35cb5cb2'"
+
+#: C/index.page:7(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy Interneta ziņot�js"
+
+#: C/index.page:8(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy Interneta ziņot�js"
+
+#: 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/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 licence."
+
+#: C/index.page:27(page/title)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Interneta ziņot�ja logo </media> Empathy Interneta ziņot�js"
+
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Kontu p�rvaldnieks"
+
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Kontaktu p�rvaldnieks"
+
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Teksta sarunas"
+
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Audio un video sarunas"
+
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Darbības lietpratējiem"
+
+#: C/index.page:55(section/title) C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Biež�k�s problēmas"
+
+#. 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 ""
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+msgstr ""
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+
+#. 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 ""
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
+msgstr ""
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
+
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Papildu inform�cija, lai pieslēgtos IRC tīkliem."
+
+#: 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/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "IRC konta inform�cija"
+
+#: 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 konti pieprasa cita veida inform�ciju, nek� vair�ki citi kontu tipi. Lai "
+"izveidotu IRC kontu, tev vajag nor�dīt vismaz IRC tīklu un savu iesauku. Šī "
+"lapa detalizēt�k par�da inform�ciju, kuru vari sniegt IRC kontam."
+
+#: 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 ""
+"Tev ir j�uzinstalē <sys>telepathy-idle</sys> paka, lai izmantotu IRC kop� ar "
+"<app>Empathy</app>."
+
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr "<gui>TÄ«kls</gui>"
+
+#: C/account-irc.page:46(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."
+msgstr ""
+"IRC ir atvērta sistēma, kura ļauj cilvēkiem reizē darbin�t vair�kus IRC "
+"tīklus. Katrs tīkls ir atšķirīgs un tam ir katram savi lietot�ji un "
+"tērzēšanas istabas. <app>Empathy</app> nor�dīs pašus popul�r�kos tīklus, "
+"<gui>Tīkls</gui> sarakst�. Tu vari pievienot papildus tīklu, lasi vair�k - "
+"<link xref=\"#networks\"/>."
+
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Iesauka</gui>"
+
+#: C/account-irc.page:54(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."
+msgstr ""
+"Tava iesauka ir unik�ls v�rds IRC tīkl�. Tikai viena persona tīkl� var "
+"izmantot vienu iesauku. Ja saņemsi kļūdas paziņojumu, kurš saka <link xref="
+"\"prob-conn-name\" role=\"error-msg\"/>, tev vajadzēs nomainīt iesauku."
+
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Parole</gui>"
+
+#: C/account-irc.page:61(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."
+msgstr ""
+"Daži serveri, liel�koties priv�tajos tīklos, pieprasa paroli, lai "
+"pieslēgtos. Ja tev ir pilnvarojums konkrēt� tīkla izmantošanai, "
+"administratoram vajadzētu tev iedot paroli."
+
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "NickServ paroles"
+
+#: C/account-irc.page:66(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."
+msgstr ""
+"Dažos serveros iesaukas var reģistrēt, izmantojot pakalpojumu NickServ. "
+"<app>Empathy</app> tieš� veid� neatbalsta iesauku paroles. Dažos tīklos, "
+"taj� skait� arī popul�raj� freenode tīkl�, serveru paroles tiek autom�tiski "
+"p�rvirzītas uz NickServ, ļaujot tev uzst�dīt sevis atpazīšanu ar NickServ. "
+"Lasi <link xref=\"irc-nick-password\"/>, lai uzzin�tu vair�k."
+
+#: C/account-irc.page:76(item/title)
+#| msgid "Real name"
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Īstais v�rds</gui>"
+
+#: C/account-irc.page:77(item/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."
+msgstr ""
+"Papildus iesaukai, tu vari nor�dīt arī savu īsto v�rdu. Citi lietot�ji to "
+"varēs redzēt, skatoties tavu profila inform�ciju."
+
+#: C/account-irc.page:81(item/title)
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Iziešanas ziņojums</gui>"
+
+#: 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 ""
+"Kad tu izej nesaistē, iziešanas ziņa tiks nosūtīta vis�m sarakstes istab�m, "
+"kur�s tu esi, k� arī visiem lietot�jiem, ar kuriem tev ir priv�ta saruna. "
+"Izmanto šo lauku, lai nor�dītu sevis izvēlētu iziešanas ziņu."
+
+#: C/account-irc.page:94(info/title)
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "IRC tīkli"
+
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "TÄ«kli"
+
+#: C/account-irc.page:99(section/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."
+msgstr ""
+"<app>Empathy</app> iekļauj sarakstu ar popul�riem IRC tīkliem. Ja vēlies "
+"redzēt k�du citu tīklu, iekļauj to sarakst�. Tu vari arī rediģēt un izņemt "
+"tīklus no saraksta."
+
+#: C/account-irc.page:104(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>."
+msgstr ""
+"Lai pievienotu tīklu sarakstam, spied uz <media type=\"image\" mime=\"image/"
+"png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Pievienot</"
+"media>."
+
+#: 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 ""
+"Lai rediģētu tīklu no saraksta, izvēlies to un spied uz <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16"
+"\">Rediģēt</media>."
+
+#: C/account-irc.page:110(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>."
+msgstr ""
+"Lai izņemtu k�du tīklu no saraksta, izvēlies to un spied uz <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Izņemt</media>."
+
+#: C/account-irc.page:115(section/p)
+msgid ""
+"When adding or modifying a network, you can enter the following information:"
+msgstr ""
+"Pievienojot vai rediģējot k�du tīklu, tu vari ievadīt sekojošo inform�ciju:"
+
+#: C/account-irc.page:121(item/p)
+msgid ""
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "Šis ir v�rds, ar kuru tīkls tiks par�dīts sarakst�."
+
+#: C/account-irc.page:125(item/title)
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Rakstzīmju kopa</gui>"
+
+#: C/account-irc.page:126(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."
+msgstr ""
+"Šis nor�da rakstzīmju kodējumu, kurš tiek izmantots uz konkrēt� tīkla. "
+"Rakstzīmju kodējums ir specifisks veids rakstzīmju ierakstīšanai dator�. Ir "
+"vair�ki rakstzīmju kodējuma veidi un tev vajag izmantot t�du pašu kodējumu, "
+"k� citiem lietot�jiem, lai varētu redzēt viņu ziņojumus pareizi."
+
+#: C/account-irc.page:135(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."
+msgstr ""
+"Pēc noklusējuma, <app>Empathy</app> izmanto UTF-8, modernu rakstzīmju "
+"kodējumu, kurš var apstr�d�t liel�ko daļu pasaules valodu tekstus. Vēl viens "
+"sastopams kodējums angļu un daž�m rietumu valod�m ir ISO-8859-1."
+
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Serveri</gui>"
+
+#: C/account-irc.page:142(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."
+msgstr ""
+"Vien� IRC tīkl� var būs daudzi serveri, kuriem tu vari pieslēgties. Kad esi "
+"pieslēdzies serverim konkrēt� tīkl�, tu vari sazin�ties ar visiem "
+"lietot�jiem visos p�rējos serveros, taj� paš� tīkl�. Tu vari pievienot vai "
+"noņemt serverus no konkrēt� tīkla, izmantojot  <gui>Pievienot</gui> un "
+"<gui>Izņemt</gui> pogas."
+
+#: C/account-irc.page:147(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."
+msgstr ""
+"Kad ir izvēlēts serveris, nospied uz lauciņa zem <gui>Serveris</gui> vai "
+"<gui>Ports</gui>, lai to rediģētu. Vēl viens variants ir izmantot kreiso vai "
+"labo virziena taustiņu, lai fokusētos uz lauciņa, un nospiest atstarpes "
+"taustiņu, lai s�ktu rediģēt."
+
+#: 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 ""
+"Izvēlies lauciņu zem <gui>SSL</gui> kolonnas, lai šifrētu visu komunik�ciju "
+"ar serveri. Piezīme: tas neattur citus lietot�jus tīkl� redzēt to, ko tu "
+"raksti publiskaj�s tērzēšanas istab�s."
+
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Paplašin�tas iespējas Jabber un Google Talk kontiem."
+
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Jabber konta inform�cija"
+
+#: C/account-jabber.page:31(page/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\"/>."
+msgstr ""
+"Vairums Jabber kontu pieprasīs tikai lietot�ja ID un paroli lai pieslēgtos. "
+"Dažiem kontiem, vai atrodoties daž�dos tīklos, tev var tikt pieprasīts "
+"ievadīt papildu inform�ciju <gui>Paplašin�ti</gui> sadaļ�. Parasti tev "
+"nevajadzēs izmantot paplašin�t�s iespējas, kas minētas zem�k. Visp�rīg�m "
+"instrukcij�m kontu pievienošan�, skaties <link xref=\"add-account\"/>."
+
+#: C/account-jabber.page:39(note/p)
+msgid ""
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr ""
+"Google Talk ir Jabber tipa konts. Šīs instrukcijas der arī Google Talk "
+"kontiem."
+
+#: C/account-jabber.page:45(item/title)
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Vajadzīga šifrēšana (TLS/SSL)</gui>"
+
+#: C/account-jabber.page:46(item/title)
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>Ignorēt SSL sertifik�ta kļūdas</gui>"
+
+#: C/account-jabber.page:47(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."
+msgstr ""
+"Kad vien tas ir iespējams, saziņa caur <app>Empathy</app> un Jabber "
+"serveriem ir šifrēta. Ja šifrēta saruna nav iespējama, ziņas var tikt "
+"nosūtītas nešifrēt� veid�. Izvēlies <gui>Šifrēšana pieprasīta</gui>, lai "
+"aizliegtu <app>Empathy</app> lietotnei sazin�ties ar Jabber serveri, kad "
+"šifrēšana nav iespējama."
+
+#: 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 ""
+"Daži Jabber serveri var iešifrēt datus, izmantojot nederīgus sertifik�tus, "
+"vai izmantojot sertifik�tus no neatpazīstamiem veidot�jiem. Ja tu uzticies "
+"serverim, kuram pieslēdzies, vari izvēlēties <gui>Ignorēt SSL sertifik�ta "
+"kļūdas</gui>, lai atļautu iešifrētu saziņu, izmantojot nederīgus "
+"sertifik�tus."
+
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Resurss</gui>"
+
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Priorit�te</gui>"
+
+#: C/account-jabber.page:61(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."
+msgstr ""
+"Ja ar tavu kontu ir savienojuš�s vair�kas lietotnes reizē (piemēram, uz "
+"atsevišķiem datoriem), tu vari iestatīt k�du no resursiem, kurš unik�li "
+"identificēs katru pieslēgto lietotni. Pēc noklusējuma <app>Empathy</app> "
+"izmantos <input>Telepathy</input> k� resursu."
+
+#: C/account-jabber.page:65(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."
+msgstr ""
+"Tu vari uzst�dīt priorit�tes, kuras noteiks, kurai lietotnei vajadzētu "
+"saņemt ziņas no kontaktiem. Jaunas ziņas tiks nosūtītas uz lietotni ar "
+"augst�ko uzst�dīto priorit�ti."
+
+#: C/account-jabber.page:70(item/title)
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Aizst�t servera iestatījumus</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 ""
+"<app>Empathy</app> izmantos noklusētos iestatījumus, lai savienotos ar "
+"Jabber serveri, balstītus uz tavu lietot�ja ID. Dažiem Jabber serveriem, "
+"serveru iestatījumus tev vajadzēs ievadīt pašam. Ar šiem iestatījumiem tevi "
+"vajadzētu nodrošin�t tavam Jabber pakalpojumu sniedzējam."
+
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Pievieno, modificē un dzēs kontus."
+
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Kontu logs"
+
+#: C/accounts-window.page:35(page/p)
+msgid ""
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr "<gui>Kontu</gui> logs ļauj pievienot, modificēt un izdzēst kontus."
+
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Konta inform�cija"
+
+#: 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 ""
+"Vairumam kontu tipu, tu vari vienk�rši ievadīt lietot�ja ID un paroli. "
+"Savuk�rt daži konti vai kontu tipi var pieprasīt papildu inform�ciju."
+
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Pievienot jaunu kontu <app>Empathy</app> lietotnei."
+
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Pievienot jaunu kontu"
+
+#: C/add-account.page:42(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\"/>."
+msgstr ""
+"Tu vari pievienot TZ kontus no jebkura atbalstīt� servisa, lai sazin�tos ar "
+"visiem saviem kontaktiem <app>Empathy</app> lietotne. Dažiem kontu "
+"sniedzējiem šie soļi ļaus piereģistrēt jaunu kontu. Plaš�kai inform�cijai, "
+"lasi <link xref=\"create-account\"/>."
+
+#: 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 ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr ""
+"<gui>Kontaktu saraksta</gui> log� izvēlies <guiseq><gui>Rediģēt "
+"</gui><gui>Konti</gui></guiseq>, vai nospied <key>F4</key>."
+
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Spied <gui style=\"button\">+</gui>."
+
+#: C/add-account.page:58(item/p)
+msgid ""
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr ""
+"<gui>Protokola</gui> sarakst�, izvēlies konta tipu, kuru vēlies pievienot."
+
+#: 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 ""
+"Ja tev vēl nav izveidots konts, izvēlies <gui>Izveidot jaunu kontu uz šī "
+"servera</gui>. Šī iespēja nav pieejama visiem kontu tipiem un var "
+"nedarboties ar dažiem kontu sniedzējiem. Plaš�kai inform�cijai, lasi <link "
+"xref=\"create-account\"/>."
+
+#: 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 ""
+"Ievadi vajadzīgo inform�ciju. Vairumam kontu vajag nor�dīt tikai lietot�ja "
+"ID un paroli. Dažiem kontiem vajag nor�dīt papildu inform�ciju. Skati <link "
+"xref=\"accounts-window#details\"/>, lai uzzin�tu vair�k."
+
+#: 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 "Spied <gui style=\"button\">Pielietot</gui>."
+
+#: C/add-account.page:81(note/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 ""
+"Lai nomainītu v�rdu, kurš identificē kontu, <gui>Kontu</gui> log�, izvēlies "
+"kontu no saraksta kreisaj� pusē un vai nu nospied uz v�rda, vai nospied "
+"atstarpes taustiņu. Rediģē konta v�rdu un spied <key>Enter</key>, kad esi "
+"pabeidzis."
+
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Pievieno k�du kontaktu sarakstam."
+
+#: 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/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Pievienot7 k�du savam kontaktu sarakstam"
+
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr ""
+"Izvēlies <guiseq><gui>Tērzēšana</gui><gui>Pievienot kontaktu</gui></guiseq>."
+
+#: C/add-contact.page:40(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."
+msgstr ""
+"<gui>Kontu</gui> sarakst� izvēlies kontu, kuru izmantosi, lai savienotos ar "
+"savu kontaktu. Tavam kontaktam vajadzēs izmantot to pašu servisu, kuru "
+"izmanto tu."
+
+#: C/add-contact.page:45(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."
+msgstr ""
+"<gui>Identifikators</gui> lauciņ�, ievadi sava kontakta lietot�ja ID, "
+"lietot�jv�rdu, ekr�na v�rdu vai k�du citu servisam pieejamu identifikatoru."
+
+#: C/add-contact.page:49(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."
+msgstr ""
+"<gui>Pseidonīms</gui> lauciņ�, ieraksti to v�rdu, ar kuru vēlies attēlot "
+"kontaktu sav� sarakst�."
+
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Spied uz <gui>Pievienot</gui>, lai pievienotu personu kontaktu sarakstam."
+
+#: C/add-contact.page:61(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."
+msgstr ""
+"Lai pievienotu jaunu personu kontaktu sarakstam, ir j�būt savienotam ar "
+"internetu un savu kontu."
+
+#. 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/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Zvani saviem kontaktiem caur internetu."
+
+#: C/audio-call.page:27(page/title)
+msgid "Start an audio conversation"
+msgstr "S�kt audio saziņu"
+
+#: C/audio-call.page:29(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."
+msgstr ""
+"Tu vari zvanīt saviem kontaktiem un uzturēt audio saziņu ar tiem. Šī iespēja "
+"str�d� tikai ar noteiktiem kontu tipiem un pieprasa, lai tavam sarunas "
+"biedram arī būtu lietotne, kas atbalsta audio zvanus."
+
+#: C/audio-call.page:34(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>."
+msgstr ""
+"<gui>Kontaktu saraksta</gui> log� nospied uz <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">video zvans</media> ikonas pie "
+"kontakta v�rda, ar kuru tu vēlies sazin�ties, un izvēlies <gui style="
+"\"menuitem\">Audio zvans</gui>."
+
+#: C/audio-call.page:42(item/p) C/video-call.page:44(item/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 ""
+"Atvērsies jauns logs. Kad savienojums būs nodrošin�ts, būs redzams uzraksts "
+"<gui>Savienots</gui>loga apakš�, kop� ar sarunas ilgumu."
+
+#: 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 ""
+"Lai sarunu beigtu, spied uz <gui style=\"button\">Nolikt klausuli</gui>."
+
+#: 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 ""
+"Lai audio zvanu p�rvērstu video zvan�, izvēlies <guiseq><gui style=\"menu"
+"\">Video</gui><gui style=\"menuitem\">Ieslēgt video</gui></guiseq>."
+
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "S�kt audio saziņu ar meta-kontaktu"
+
+#: 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 ""
+"No <gui>Kontaktu saraksts</gui> loga, ar labo peles klikšķi spied uz meta-"
+"kontakta."
+
+#: C/audio-call.page:71(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr ""
+"Izvēlies kontaktu, ar kuru vēlies sazin�ties un no izvēlnes paņem <gui style="
+"\"menuitem\">Audio zvans</gui>."
+
+#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/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 ""
+"Lai atpazītu vai konkrēts kontakts ir meta-kontakts, tad <gui>Kontaktu "
+"saraksts</gui> log� pavirzi pelītes kursoru virs kontakta v�rda un atst�j to "
+"taj� viet� uz p�ris sekundēm, pēc šīm p�ris sekundēm, neliela uzlecoša ziņa "
+"par�dīsies un par�dīs kontaktu skaitu, kurš veido meta-kontaktu."
+
+#. 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 ""
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
+msgstr ""
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
+
+#: C/audio-video.page:8(info/desc)
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
+msgstr "Inform�cija par to, kad ir iespējama audio vai video saziņa."
+
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Audio un video atbalsts"
+
+#: 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 ""
+"Audio on video sarunas ir iespējamas tikai starp kontaktiem, kuri izmanto "
+"lietotni, kura atbalsta šo iespēju. Ja tavi kontakti ir pieejami audio vai "
+"video zvanam, pie viņu v�rdiem kontaktu sarakst� jūs redzēsiet sekojošas "
+"ikonas:"
+
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Ikona"
+
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Apraksts"
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Ikona audio sarunai </media>"
+
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "Å is kontakts ir pieejams audio sarunai."
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Ikona video sarunai </media>"
+
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "Å is kontakts ir pieejams video sarunai."
+
+#: C/audio-video.page:83(note/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."
+msgstr ""
+"Lai varētu sazin�ties caur audio, tev ir vajadzīga skaņas karte, kuru "
+"savuk�rt atbalsta tava operetēt�jsistēma, k� arī ir nepieciešams arī "
+"mikrofons."
+
+#: C/audio-video.page:87(note/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."
+msgstr ""
+"Lai varētu sazin�ties caur video, tev ir vajadzīga tīmekļa kamera, kuru "
+"atbalsta tava operēt�jsistēma, k� arī str�d�jošs mikrofons."
+
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Atbalstītie kontu veidi"
+
+#: C/audio-video.page:97(section/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 ""
+"Video un audio sarunas ir pieejamas, izmantojot kontus, kuri ir piesaistīti "
+"konkrētam, atbalstītam servisam. Sekojoš� tabula nor�da vai audio un video "
+"saziņa ir pieejama katram kontu tipam: "
+
+#: 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 ""
+"Kontu tipus nodrošina spraudņi. Tavai sistēmai varētu nebūt pieejami visi "
+"šeit uzskaitītie tipi, vai arī tev var būt t�di tipi, kuri nav uzskaitīti "
+"šeit. Atjaunin�ti spraudņi var padarīt audi un video saziņu iespējamu starp "
+"kontu tipiem, kuri ir uzskaitīti k� neatbalstīti."
+
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Serviss"
+
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Audio"
+
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Video "
+
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
+
+#: 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 "NÄ“"
+
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook tērzēšana"
+
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
+
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: 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 "J�"
+
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
+
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
+
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
+
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
+
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "People Nearby (cilvēki tuvum�)"
+
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
+
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
+
+#: 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 "Maini savu statusu, lai paziņotu savu pieejamību kontaktiem."
+
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Mainīt savu statusu"
+
+#: C/change-status.page:41(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."
+msgstr ""
+"Tu vari iestatīt savu statusu, lai paziņotu par savu pieejamību kontaktiem. "
+"<app>Empathy</app> ļauj tev izvēlēties k�du statusu no iepriekš sagatavota "
+"saraksta."
+
+#: C/change-status.page:46(item/p)
+msgid ""
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "Nospied uz izkrītoš� saraksta <gui>Kontaktu saraksta</gui> loga augš�."
+
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Izvēlies statusu no saraksta."
+
+#: C/change-status.page:57(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."
+msgstr ""
+"Skati <link xref=\"status-icons\"/>, lai uzzin�tu vair�k par iebūvētajiem  "
+"statusiem un ko tie nozīmē. Tu vari arī <link xref=\"set-custom-status"
+"\">pievienot statusa ziņojumus</link>, lai saviem kontaktiem nodotu vair�k "
+"inform�cijas par savu pieejamību."
+
+#: C/change-status.page:63(note/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."
+msgstr ""
+"Ja k�du laiku neizmanto datoru, vai ja ir ieslēgts ekr�nsaudzēt�js, tavs "
+"statuss autom�tiski nomainīsies uz \"Prom\"."
+
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Reģistrē kontu izmantojot vienu no atbalstītajiem ziņojumu servisiem. "
+
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Reģistrēt jaunu kontu"
+
+#: C/create-account.page:36(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>."
+msgstr ""
+"Vairums kontu tipu pieprasa tos reģistrēt pie konta sniedzēja, pirms tu tos "
+"vari s�kt izmantot TZ lietotnēs, k� <app>Empathy</app>. Pie dažiem kontu "
+"sniedzējiem vari izmantot <app>Empathy</app> lietotni, lai reģistrētu jaunu "
+"kontu, izmantojot tos pašus soļus, kurus tu izmantotu, lai <link xref=\"add-"
+"account\">pievienotu kontu</link>."
+
+#: C/create-account.page:42(page/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 ""
+"Šī lapa sniedz inform�ciju par to, k� izveidot jaunu kontu, daž�diem kontu "
+"veidiem. Konta sniedzējam vajadzētu nodrošin�t ar konta ID un paroli, k� arī "
+"ar papildus inform�ciju, kura ir nepieciešama <app>Empathy</app> "
+"izmantošanai."
+
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:48(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."
+msgstr ""
+"Facebook ir viens no visplaš�k izmantotajiem soci�lajiem tīkliem. Tas ļauj "
+"lietot�jiem izveidot pašiem savu profilu un sazin�ties ar saviem draugiem."
+
+#: C/create-account.page:52(section/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 ""
+"Lai izmantotu Facebook, tev būs j�izveido jauns konts viņu m�jaslap�: <link "
+"href=\"http://www.facebook.com\">www.facebook.com</link>."
+
+#: C/create-account.page:62(section/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 ir atvērta tiešo ziņojumu sistēma. T� pat k� epasts, Jabber ļauj tev "
+"izvēlēties tavu konta sniedzēju un sazin�ties ar citiem Jabber lietot�jiem, "
+"neatkarīgi no viņu konta sniedzēja."
+
+#: C/create-account.page:66(section/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 ""
+"Tev vajadzēs izveidot jaunu profilu, izmantojot Jabber pakalpojumu "
+"sniedzēju. Ir vair�ki bezmaksas pakalpojumu sniedzēji; viens no "
+"popul�r�kajiem ir <link href=\"http://register.jabber.org/\">Jabber.org</"
+"link>."
+
+#: C/create-account.page:71(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."
+msgstr ""
+"Ja izmanto Google Mail vai Google Talk, tev jau ir Jabber konts! Google Talk "
+"ir Jabber pakalpojums. Vienk�rši izmanto savu Google Mail adresi un paroli "
+"<app>Empathy</app> lietotnē, lai savienotos."
+
+#: C/create-account.page:80(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."
+msgstr ""
+"Tev nevajag izveidot kontu ar pakalpojumu sniedzēju, lai izmantotu šo "
+"pakalpojumu. Šis pakalpojums str�d� jebkad, kad vien tu esi pieslēdzies "
+"lok�lajam tīklam, piemēram bezvadu pieejas punktam (WiFi). Tas autom�tiski "
+"atradīs visus lietot�jus taj� paš� tīkl�, kuri izmanto šo servisu."
+
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Lai uzzin�tu vair�k, skaties <link xref=\"salut-protocol\"/>."
+
+#: C/create-account.page:91(section/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 ir atvērta sistēma, kura ļauj lietot�jiem sazin�ties audio un video "
+"veid� caur internetu. Tam ir j�izveido konts, izmantojot SIP pakalpojumu "
+"sniedzēju. Tu vari sazin�ties ar jebkuru SIP lietot�ju, neatkarīgi no t�, "
+"k�du SIP pakalpojumu sniedzēju viņš/-a izmanto."
+
+#: C/create-account.page:97(note/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 ""
+"Sakar� ar tehnisk�m atšķirīb�m, bezmaksas pieejamais <link href=\"https://"
+"www.ekiga.net/index.php?page=register\">Ekiga.net</link> pakalpojums nav "
+"savienojams ar <app>Empathy</app>."
+
+#: C/create-account.page:102(section/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 ""
+"Daži SIP pakalpojumu sniedzēji ļauj tev zvanīt uz parastajiem telefoniem no "
+"tava datora. Lai šo pakalpojumu izmantotu, tev vajadzēs lietot maksas "
+"pakalpojumu."
+
+#: C/create-account.page:109(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."
+msgstr ""
+"Tev nevajag reģistrēt kontu, lai izmantotu IRC. Tomēr tu vari nor�dīt sev "
+"tīkamu lietot�jv�rdu, kad pievieno IRC kontu <app>Empathy</app> lietotnei. "
+"Šis lietot�jv�rds tiek izveidots tikai katru reizi, kamēr tu esi "
+"pieslēdzies. Ja k�ds cits jau izmanto tavu lietot�jv�rdu, tev n�ksies "
+"izvēlēties k�du citu."
+
+#: C/create-account.page:114(section/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."
+msgstr ""
+"Daži IRC kan�li izmanto pakalpojumu, sauktu par NickServ, lai ļautu "
+"lietot�jiem aizsarg�t viņu lietot�jv�rdus. Lasi <link xref=\"irc-nick-"
+"password\"/>, lai uzzin�tu vair�k."
+
+#: C/create-account.page:117(section/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."
+msgstr ""
+"Daži IRC serveri ir aizsarg�ti ar paroli. Lai pieslēgtos šiem serveriem, tev "
+"vajadzēs paroli. P�rsvar� š�di serveri ir priv�tie IRC tīkli."
+
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Īpašnieka servisi"
+
+#: C/create-account.page:124(section/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."
+msgstr ""
+"Past�v vair�ki īpašnieka TZ servisi kurus ir izstr�d�jušas daž�das "
+"komp�nijas vai organiz�cijas. <app>Empathy</app> ļauj tev savienoties ar jau "
+"esošu kontu vairumam popul�r�ko servisu. Lai izveidotu jaunu kontu ar k�du "
+"no šiem servisiem, tev vajadzēs apmeklēt attiecīg� servisa m�jaslapu un "
+"piekrist t�s lietošanas noteikumiem."
+
+#: 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/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/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/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/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Aizliedz <app>Empathy</app> lietotnei autom�tiski ieiet kont�."
+
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Deaktivēt kontu"
+
+#: C/disable-account.page:42(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."
+msgstr ""
+"Tu vari deaktivēt kontu, lai liegtu <app>Empathy</app> lietotnei ar to "
+"ierakstīties, neizdzēšot kontu pavisam. Tu vari deaktivēt un atkal aktivēt "
+"kontu, ja taj� vēlies ieiet tikai noteiktos brīžos, bet vēlies izmantot "
+"<app>Empathy</app> citiem kontiem."
+
+#: C/disable-account.page:53(item/p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Izvēlies kontu, kuru vēlies atslēgt, no kontu saraksta kreisaj� loga pusē."
+
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Loga labaj� pusē izslēdz �r�."
+
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Lai atk�rtoti aktivētu kontu, ieslēdz."
+
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Uzst�di, pievienojies un p�rvaldi iecienīt�s istabas."
+
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Iecienīt�s istabas"
+
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Uzst�di istabu k� iecienīto"
+
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Pievienojies istabai."
+
+#: C/favorite-rooms.page:40(item/p)
+msgid ""
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
+msgstr ""
+"Skaties <link xref=\"irc-join-room\"/>, lai iegūtu vair�k inform�cijas par "
+"to, k� piekļūt IRC istab�m."
+
+#: C/favorite-rooms.page:46(item/p)
+msgid ""
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
+msgstr ""
+"Skaties <link xref=\"group-conversations\"/>, lai iegūtu vair�k inform�cijas "
+"par to, k� s�kt vai pievienoties grupu sarun�m."
+
+#: C/favorite-rooms.page:54(item/p)
+msgid ""
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
+msgstr ""
+"No sarunas loga izvēlies <guiseq><gui>Saruna</gui><gui>Iecienīt� tērzēšanas "
+"istaba</gui></guiseq>"
+
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Pievienoties iecienītaj�m istab�m."
+
+#: 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 "<gui>Kontaktu saraksta</gui> log� izpildi vienu no sekojošaj�:"
+
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Nospied <key>F5</key>."
+
+#: C/favorite-rooms.page:76(item/p)
+msgid ""
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
+msgstr ""
+"Izvēlies <guiseq><gui>Istaba</gui><gui>Pievienoties iecienītaj�m</gui></"
+"guiseq>, lai pievienotos vis�m iecienītaj�m istab�m."
+
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr ""
+"Izvēlies <gui>Istaba</gui>, un izvēlies iecienīto istabu, kurai vēlies "
+"pievienoties."
+
+#: 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 ""
+"Lai pievienotos k�dai no iecienītaj�m istab�m, tev ir j�būt interneta "
+"savienojumam un savam profilam."
+
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "P�rvaldīt iecienīt�s istabas"
+
+#: C/favorite-rooms.page:101(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
+msgstr ""
+"No <gui>Kontaktu saraksta</gui> loga, izvēlies <guiseq><gui>Istaba</"
+"gui><gui>P�rvaldīt iecienīt�s</gui></guiseq>."
+
+#: C/favorite-rooms.page:107(item/p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr ""
+"No <gui>Konts</gui> saraksta, izvēlies kontu, kura iecienīt�s istabas vēlies "
+"p�rvaldīt."
+
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Izvēlies <gui>Viss</gui>, lai redzētu visas iecienīt�s istabas."
+
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Izvēlies iecienīto istabu, kuru vēlies p�rvaldīt:"
+
+#: C/favorite-rooms.page:121(item/p)
+msgid ""
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
+msgstr ""
+"Izvēlies <gui>Autom�tiski savienoties</gui> opciju, lai autom�tiski "
+"pievienotos šai istabai, kolīdz esi savienojies ar savu kontu."
+
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr ""
+"Nospied uz <gui>Izņemt</gui>, lai izņemtu attiecīgo istabu no iecienīto "
+"istabu saraksta."
+
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Kad esi pabeidzis dar�mo, spied <gui>Aizvērt</gui>."
+
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr ""
+"Izmanto un saproti ģeogr�fisko atrašan�s vietu <app>Empathy</app> lietotnē."
+
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Ģeogr�fiskais novietojums"
+
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Ģeografisk� atrašan�s vieta"
+
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Salabot visbiež�k sastopam�s problēmas"
+
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> nepublicē tavu ģeogr�fisko atrašan�s vietu."
+
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Ģeogr�fisk� atrašan�s vieta netiek publicēta"
+
+#: C/geolocation-not-showing.page:34(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."
+msgstr ""
+"Ja tavi kontakti neredz tavu atrašan�s vietu, <app>Empathy</app>, iespējams, "
+"nav to spējusi noteikt ar labu precizit�ti."
+
+#: C/geolocation-not-showing.page:38(page/p)
+msgid ""
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
+msgstr ""
+"Šaj� gadījum� tava atrašan�s vieta netiek publicēta, ta�u tu vēl jo proj�m "
+"var redzēt savu kontaktu atrašan�s vietas."
+
+#: C/geolocation-not-showing.page:42(page/p)
+msgid ""
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr ""
+"Ja tu vēlies publicēt šo atrašan�s vietu, izmēģini izmantot k�du �rējo "
+"ierīci, piemēram GPS."
+
+#: C/geolocation-not-showing.page:48(note/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 ""
+"Lai varētu publicēt savu ģeogr�fisko atrašan�s vietu, tavam Jabber serverim "
+"ir j�atbalsta \"Personal Eventing Protocal (PEP)\". Saraksts ar  <link href="
+"\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">serveriem, kuri "
+"atbalsta PEP</link>, ir pieejams tiešsaistē. Google Talk pagaid�m šo "
+"funkciju neatbalsta."
+
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "K�da un kam inform�cija tiek nosūtīta."
+
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Ģeogr�fisk�s atrašan�s vietas priv�tums"
+
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "K�da inform�cija tiek nosūtīta"
+
+#: C/geolocation-privacy.page:36(section/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 ""
+"Nosūtīt ir iespējams: tavu valsti, reģionu, apvidu, rajonu, ielu, ēku, "
+"st�vu, dzīvokli, pasta indeksu, garuma, platuma un augstuma gr�dus, �trumu "
+"un azimutu."
+
+#: C/geolocation-privacy.page:40(section/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 ""
+"Precizit�te un daudzums, kurš tiks noteikts par tavu atrašan�s vietu ir "
+"atkarīgs no programmatūras vai infrastruktūras, kura tiek izmantota, lai to "
+"noteiktu."
+
+#: 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 ""
+"Daž�diem savienojumu veidiem var būt atšķirīgi precizit�tes iestatījumi un "
+"var sūtīt daž�du inform�ciju. Noteikšanas precizit�tes uzlabosies, "
+"izmantojot �rēj�s ierīces, piemēram, GPS vai mobilo t�lruni."
+
+#: C/geolocation-privacy.page:49(section/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 ""
+"Ja ir aktivēts priv�tuma režīms, nekas vair�k par pašreizējo pilsētu netiks "
+"nosūtīts, pat ja izmanto k�du �rējo ierīci."
+
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Kas var redzēt nosūtīto inform�ciju"
+
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Tikai tavi kontakti var redzēt tavu ģeogr�fisko atrašan�s vietu,"
+
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Kas ir priv�tuma režīms"
+
+#: C/geolocation-privacy.page:64(section/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 ""
+"Priv�tuma režīms, kurš ir noklusētais iestatījums, ir tas pats, kas "
+"samazin�ts precizit�tes noteikšanas režīms, kurš samazina precizit�ti tavas "
+"atrašan�s vietas noteikšan�."
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Priv�tuma p�rskats"
+
+#: C/geolocation-privacy.page:72(section/p)
+msgid ""
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr ""
+"P�rskats daž�diem ģeogr�fisk�s atrašan�s vietas priv�tuma iestatījumiem "
+"<app>Empathy></app> lietotnē."
+
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "Ģeogr�fisk�s atrašan�s vietas noteikšana nav aktivēta pēc noklusējuma."
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "Priv�tuma režīms ir aktivēts pēc noklusējuma."
+
+#: C/geolocation-privacy.page:87(item/p)
+msgid ""
+"Privacy mode prevails even when using external and more precise devices."
+msgstr ""
+"Priv�tuma režīms paliek aktivēts arī tad, ja izmanto k�du �rējo ierīci."
+
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Tikai tavi kontakti redz tavu atrašan�s vietu."
+
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr ""
+"Servisi, kuri atbalsta ģeogr�fisk�s atrašan�s vietu un to savietojamība."
+
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Atbalstītie servisi"
+
+#: C/geolocation-supported.page:33(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."
+msgstr ""
+"Ģeogr�fisk�s atrašan�s vietas iespēja uz doto brīdi ir saderīga tikai ar "
+"Jabber servisu. Lai to izmantotu, tev, k� arī taviem kontaktiem, ir j�būt "
+"Jabber kontam."
+
+#: C/geolocation-supported.page:39(note/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 ""
+"Arī serverim, kuru tu lieto, j�atbalsta ģeogr�fisk�s atrašan�s vietas "
+"noteikšanas pakalpojums. Liel�k� daļa no Jabber serveriem to atbalsta. Lasi "
+"sava servisa tīmekļa vietnes dokument�ciju, lai uzzin�tu vair�k."
+
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Savietojamība"
+
+#: 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 ""
+"<app>Empathy</app> ģeogr�fisk�s atrašan�s vietas pakalpojums nav saderīgs ar "
+"citiem šī pakalpojuma servisiem, piemēram <em>Google Latitude</em>, "
+"<em>Yahoo Fire Eagle</em> vai <em>Brightkite</em>."
+
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr ""
+"K� aktivizēt vai deaktivizēt atrašan�s vietas noteikšanu <app>Empathy</app> "
+"lietotnē."
+
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Aktivizēt/deaktivizēt ģeogr�fisk�s atrašan�s vietas noteikšanu"
+
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Izvēlies <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq>."
+
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Izvēlies <gui>Vieta</gui> cilni."
+
+#: C/geolocation-turn.page:47(item/p)
+msgid ""
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr ""
+"Izvēlies <gui>Par�dīt kontaktiem atrašan�s vietu</gui>, lai aktivizētu "
+"ģeogr�fisk�s atrašan�s vietas pakalpojumu."
+
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Lai to deaktivizētu, noņem t�s izvēli."
+
+#: C/geolocation-turn.page:55(item/p)
+msgid ""
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
+msgstr ""
+"Lai uzlabotu atrašan�s vietas precizit�ti, noņem izvēli <gui>Samazin�t "
+"atrašan�s vietas precizit�ti</gui>."
+
+#: C/geolocation-turn.page:61(item/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 ""
+"Ja tev ir papildu ierīce, piemēram, GPS, vai ja vēlies sūtīt vēl precīz�ku "
+"atrašan�s vietu, izvēlies tam piemēroto opciju <gui>Vietas avoti</gui> "
+"sadaļ�."
+
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Ģeogr�fisk�s atrašan�s vietas izpratne."
+
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Kas ir ģeogr�fisk� atrašan�s vieta"
+
+#: C/geolocation-what-is.page:35(page/p)
+msgid ""
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
+msgstr ""
+"Ģeogr�fisk� atrašan�s vieta ļauj tev identificēt esošo ģeogr�fisko atrašan�s "
+"vietu k�dai ierīcei vai datoram, kurš ir savienots ar internetu."
+
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Ar ģeogr�fisk�s atrašan�s vietu <app>Empathy</app> lietotnē tu vari:"
+
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Paust zin�mu savu atrašan�s vietu saviem kontaktiem. "
+
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "Uzzin�t savu kontaktu atrašan�s vietu un �tri sazin�ties ar tiem."
+
+#: C/geolocation-what-is.page:52(item/p)
+msgid ""
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr ""
+"Iestatīt savas atrašan�s vietas precizit�ti, k� arī iestatīt noteikšanas "
+"precizit�ti ierīcei, kura nosaka tavu atrašan�s vietu."
+
+#: 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 ""
+"Lai redzētu savu kontaktu atrašan�s vietas, viņiem ir j�izmantoservisu un "
+"lietotni, kas atbalsta ģeogr�fisk�s atrašan�s vietas noteikšanu."
+
+#: C/group-conversations.page:8(info/desc)
+msgid "Start or join a group conversation with your contacts."
+msgstr "S�c vai pievienojies grupas sarunai ar saviem kontaktiem."
+
+#: C/group-conversations.page:34(page/title)
+msgid "Group conversations"
+msgstr "Sarunas grup�"
+
+#: 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."
+msgstr ""
+"Grupu sarunas ļauj tev sarakstīties ar vair�k nek� vienu kontaktu "
+"vienlaicīgi."
+
+#: 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 ""
+"Lai varētu izmantot grupu sarunas, tev ir nepieciešams vai nu Jabber, vai "
+"Google Talk, vai People Nearby konts."
+
+#: 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."
+msgstr ""
+"Grupu sarunas ir iespējamas tikai starp kontaktiem, kuri izmanto t�du pašu "
+"pakalpojumu, k� tu."
+
+#: C/group-conversations.page:54(section/title)
+msgid "Start a group conversation"
+msgstr "S�kt grupu sarunu"
+
+#: 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 ""
+"No <gui>Kontaktu saraksta</gui> loga, izvēlies <guiseq><gui>Istaba</"
+"gui><gui>Pievienoties</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."
+msgstr ""
+"No <gui>Konts</gui> saraksta izvēlies kontu, kuru vēlies izmantot grupas "
+"sarun�."
+
+#: 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."
+msgstr ""
+"<gui>Serveris</gui> teksta lauciņ� ieraksti t� servera nosaukumu, kur� "
+"norisin�sies saruna."
+
+#: C/group-conversations.page:73(item/p)
+msgid "Leave it empty if it will be on the current server."
+msgstr "Atst�j lauciņu tukšu, ja sarakste notiks esošaj� serverī."
+
+#: 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."
+msgstr "<gui>Istaba</gui> teksta lauk� ieraksti sev tīkamo sarunas nosaukumu."
+
+#: 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 "
+"to create a private room."
+msgstr ""
+"Šis būs nosaukums istabai, kur� notiks sarakste. Šo nosaukumu redzēs jebkurš "
+"lietot�js un jebkurš varēs pievienoties. Izveidot priv�tu sarakstes istabu "
+"nevar."
+
+#: 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 ""
+"Lai uzaicin�tu kontaktus pievienoties sarunai, no <gui>Kontaktu saraksta</"
+"gui> loga izvēlies kontaktu, kuru vēlies uzaicin�t un veic vienu no "
+"sekojošaj�m darbīb�m:"
+
+#: C/group-conversations.page:97(item/p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+msgstr ""
+"Ar labo peles pogu spied uz kontakta un izvēlies <gui>Uzaicin�t uz "
+"tērzēšanas istabu</gui>."
+
+#: C/group-conversations.page:102(item/p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
+"gui></guiseq>."
+msgstr ""
+"Izvēlies <guiseq><gui>Rediģēt</gui><gui>Kontakts</gui><gui>Uzaicin�t uz "
+"tērzēšanas istabu</gui></guiseq>."
+
+#: 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."
+msgstr ""
+"Ja tev ir atvērta vair�k nek� viena grupu sarakste, izvēlies to, uz kuru "
+"vēlies uzaicin�t savus kontaktus."
+
+#: C/group-conversations.page:118(section/title)
+msgid "Join a group conversation"
+msgstr "Pievienoties grupas sarunai"
+
+#: C/group-conversations.page:128(item/p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
+msgstr ""
+"Izvērs <gui>Istabu saraksta</gui> nodalījumu, lai redzētu visas pieejam�s "
+"istabas."
+
+#: C/group-conversations.page:133(item/p)
+msgid "Double-click on the name of a room to join it."
+msgstr "Veic dubultklikšķi uz istabas nosaukuma, kurai vēlies pievienoties."
+
+#: 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 "
+"support these kind of rooms."
+msgstr ""
+"Vis�m istab�m var nebūt iespējams pievienoties. Atsevišķas istabas var "
+"pieprasīt paroli, vai var būt iespējamas tikai ar ielūgumiem. <app>Empathy</"
+"app> š�da veida istabas neatbalsta."
+
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Paslēpt nesaistē esošos kontaktus no <gui>Kontaktu saraksta</gui>."
+
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Paslēpt nesaistē esošos kontaktus"
+
+#: C/hide-contacts.page:21(page/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."
+msgstr ""
+"Parasti <app>Empathy</app> par�da visus tavus kontaktus: tos, kuri ir "
+"tiešsaistē un ar kuriem tu vari sazin�ties, k� arī tos, kuri ir nesaistē."
+
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "Lai paslēptu kontaktus, kuri ir nesaistē:"
+
+#: 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 ""
+"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 ""
+"No <gui>Kontaktu saraksta</gui> loga izvēlies <guiseq><gui>Skats</gui><gui>"
+"Nesaistes kontakti</gui></guiseq>, vai spied <keyseq><key>Ctrl "
+"</key><key>H</key></keyseq>."
+
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr ""
+"Lai atkal r�dītu nesaistē esošos kontaktus, atk�rto iepriekšējo darbību."
+
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Importēt kontu no k�das citas tūlītēj�s tērzēšanas lietotnes."
+
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
+
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Importēt esošu kontu "
+
+#: 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 ""
+"Pirmaj� <app>Empathy</app> palaišanas reizē, jums pied�v�s importēt kontus "
+"no cit�m tūlītēj�s tērzēšanas lietotnēm. Pagaid�m vienīg� atbalstīt� "
+"lietotne ir <app>Pidgin</app>."
+
+#: 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 ""
+"Palaist <app>Empathy</app> pirmo reizi. Palīgs jums pied�v�s vair�kas "
+"izvēles konta izveidošanai."
+
+#: C/import-account.page:54(item/p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Izvēlies <gui>J�, importēt konta inform�ciju no</gui> un spied "
+"<gui>Turpin�t</gui>"
+
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Atzīmē katru kontu, kuru vēlies importēt."
+
+#: C/import-account.page:66(note/p)
+msgid ""
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
+msgstr ""
+"Pagaid�m nevar importēt kontus pēc tam, kad esi pabeidzis pirm�s palaišanas "
+"palīgu."
+
+#. 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 ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
+msgstr ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
+
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Ievads <app>Empathy</app> tūlītēj�s ziņojumapmaiņas lietotnē."
+
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Ievads"
+
+#: C/introduction.page:23(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."
+msgstr ""
+"<app>Empathy</app> ir tūlītēj�s ziņojumapmaiņas lietotne, izveidota GNOME "
+"darbvirsmai. T� atbalsta teksta ziņojumus, balss un video zvanus, failu "
+"sūtīšanu un visas visbiež�k izmantot�s ziņojumu sistēmas, piemēram MSN un "
+"Google Talk."
+
+#: C/introduction.page:28(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."
+msgstr ""
+"<app>Empathy</app> sevī ietver iespējas, kas palīdz lab�k sadarboties darba "
+"vidē un kuras palīdz viegl�k sazin�ties ar draugiem."
+
+#: C/introduction.page:32(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."
+msgstr ""
+"Izmantojot <app>Empathy</app>, tu vari sagrupēt visas notiekoš�s sarakstes "
+"vien� log�, vari arī katrai sarakstei atvēlēt savu logu, vienk�rši meklēt "
+"cauri vis�m sarakstēm un dalīties ar savu darbvirsmu ar tikai diviem "
+"klikšķiem!"
+
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>Kontaktu saraksta</gui> logs"
+
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app> galvenais logs"
+
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app> galvenais logs."
+
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Atbalstīt�s IRC komandas."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Atbalstīt�s IRC komandas"
+
+#: C/irc-commands.page:19(page/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 ""
+"Lai redzētu sarakstu ar atbalstītaj�m IRC komand�m, tērzēšanas istab� "
+"ieraksti <input>/help</input> un nospied <key>Enter</key>."
+
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "Vis�m pieejamaj�m komand�m ir neliels to lietošanas paskaidrojums."
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Ieej ar paroli aizsarg�t�s IRC tērzēšanas istab�s."
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Pievienoties aizsarg�tai IRC saziņas istabai"
+
+#: C/irc-join-pwd.page:27(page/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 ""
+"Dažos IRC tīklos, priv�t�s IRC istabas var būt aizsarg�tas ar paroli. Ja tu "
+"zini šo paroli, izpildi sekojošos soļus lai pievienotos:"
+
+#: 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\">Pievienojies istabai</link> k� tu to parasti "
+"darītu."
+
+#: C/irc-join-pwd.page:38(item/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 tev pieprasīs paroli. Ievadi IRC istabas paroli un spied <gui style="
+"\"button\">Pievienoties</gui>."
+
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Pievienojies IRC kan�lam."
+
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Pievienoties IRC tērzēšanas istabai."
+
+#: 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 ""
+"Tu vari pievienoties IRC tērzēšanas istab�m (zin�m�m k� IRC kan�liem) "
+"jebkur� IRC tīkl�, kuram esi pieslēdzies. Lai pieslēgtos IRC tīklam, lasi "
+"<link xref=\"add-account\"/> un <link xref=\"account-irc\"/>."
+
+#: C/irc-join-room.page:45(item/p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr ""
+"<gui>Konts</gui> izkrītošaj� izvēlnē izvēlies IRC kontu, kurš atbilst "
+"tīklam, kuru vēlies izmantot."
+
+#: 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 ""
+"<gui>Istaba</gui> teksta laukum�, ieraksti kan�la nosaukumu, kuram vēlies "
+"pievienoties. IRC kan�lu nosaukumi s�kas ar restītes zīmi (<sys>#</sys>)."
+
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Spied <gui>Pievienoties</gui>, lai pievienotos istabai."
+
+#: C/irc-join-room.page:64(note/p)
+msgid ""
+"To join multiple rooms, you need to repeat the steps above for each room."
+msgstr ""
+"Lai pievienotos vair�k�m istab�m vienlaicīgi, tev n�ksies atk�rtot šos soļus "
+"katrai istabai."
+
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "K� izmantot IRC kop� ar <app>Empathy</app>."
+
+#: C/irc-manage.page:34(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+#: C/irc-manage.page:41(when/p)
+msgid ""
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">Install telepathy-idle</link>"
+msgstr ""
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">Instalēt telepathy-idle</link>"
+
+#: C/irc-manage.page:48(info/title)
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC tērzēšanas istabas un sarunas"
+
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Tērzēšanas istabas un sarunas"
+
+#: C/irc-manage.page:55(info/title)
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Biež�k�s IRC problēmas"
+
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr ""
+"Aizsarg� savu segv�rdu, lai neļautu citiem IRC lietot�jiem to izmantot."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Izmantot segv�rda paroli IRC tīkl�"
+
+#: C/irc-nick-password.page:35(page/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 ""
+"Dažos IRC tīklos, tu vari reģistrēt savu segv�rdu, izmantojot servisu, "
+"sauktu par NickServ. Sūtot īpašas komandas NickServ, tu vari iestatīt paroli "
+"un identificēt sevi. Dažas IRC istabas var tev neatļaut pieslēgties, "
+"nereģistrējot segv�rdu."
+
+#: C/irc-nick-password.page:40(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> pašlaik neatbalsta segv�rdu reģistr�ciju. Daži IRC tīkli "
+"autom�tiski nosūtīs <em>servera paroli</em> uz NickServ. Šajos tīklos tu "
+"vari izmantot IRC paroli, <app>Empathy</app> lietotnē, lai identificētu sevi "
+"NickServ servis�. Popul�rajam freenode tīklam ir šī funkcija."
+
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "Lai iestatītu IRC paroli:"
+
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Izvēlies IRC kontu no saraksta, kreisaj� loga pusē."
+
+#: 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 ""
+"<gui>Parole</gui> lauk�, raksti paroli, kuru izmantoji, lai reģistrētu "
+"segv�rdu."
+
+#: 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 ""
+"Šīs instrukcijas ļauj tev izmantot ar paroli aizsarg�tu iesauku noteiktos "
+"IRC tīklos. Uz doto brīdi nav iespējams reģistrēt IRC iesauku, vai to "
+"mainīt, izmantojot <app>Empathy</app>."
+
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> pašlaik neatbalsta failu sūtīšanu caur IRC."
+
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "SÅ«ti failus caur IRC"
+
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Pagaid�m nav iespējams sūtīt failus, izmantojot IRC."
+
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "S�kt sarunu ar IRC kontaktu."
+
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Sarakstīties ar k�du IRC lietot�ju"
+
+#: 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 ""
+"Tu vari uzturēt priv�tas sarunas ar citiem IRC lietot�jiem, �rpus "
+"publiskaj�m IRC istab�m. Lai s�ktu sarunu ar k�du IRC lietot�ju:"
+
+#: C/irc-start-conversation.page:37(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>."
+msgstr ""
+"IRC sarakstes istabas dalībnieku sarakst� veic dubultklikšķi uz t� lietot�ja "
+"segv�rda, ar kuru vēlies sazin�ties. K� arī var veikt labo peles klikšķi un "
+"izvēlēties <gui>Tērzēt</gui>."
+
+#: C/irc-start-conversation.page:45(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."
+msgstr ""
+"IRC istabu dalībnieku saraksts nav tas pats, kas <app>Empathy</app> kontaktu "
+"saraksts. Tas satur sarakstu ar lietot�jiem, kuri atrodas taj� paš� istab�, "
+"kur� jūs. Daž�d�s istab�s būs daž�di kontakti."
+
+#: C/irc-start-conversation.page:52(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>."
+msgstr ""
+"IRC istabu kontaktu saraksts parasti atrodas istabas loga labaj� pusē. Ja tu "
+"to neredzi, izvēlies <guiseq><gui>Saruna</gui><gui>R�dīt kontaktu sarakstu</"
+"gui></guiseq>."
+
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Juridisk� inform�cija."
+
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "License"
+
+#: C/license.page:12(page/p)
+msgid ""
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
+msgstr ""
+"Šis darbs tiek izplatīts balstoties uz CreativeCommons Attribution-Share "
+"Alike 3.0 neportēto licenci."
+
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Tu drīksti:"
+
+#: C/license.page:25(item/title)
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "<em>Izplatīt</em>"
+
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Kopēt, izplatīt un p�rraidīt šo darbu."
+
+#: C/license.page:29(item/title)
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "<em>P�rveidot</em>"
+
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Piemērot."
+
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Zem sekojošajiem noteikumiem:"
+
+#: C/license.page:38(item/title)
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "<em>Attiecin�jums</em>"
+
+#: C/license.page:39(item/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 ""
+"Tev ir oblig�ti j�attiecina darbs veid�, kurš to ir nor�dījis autors vai "
+"licencēt�js (bet ne t�d� veid� veid�, kas liktu noprast, ka tie atbalsta "
+"tevi vai tava darba izmantošanu)."
+
+#: C/license.page:46(item/title)
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "<em>Share Alike</em>"
+
+#: 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 ""
+"Ja tu pamaini, p�rveido šo darbu, tu to drīksti izplatīt tikai zem š�das "
+"pašas vai savietojamas licences."
+
+#: C/license.page:53(page/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 ""
+"Lai iegūtu pilnu licences tekstu, skaties <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons "
+"m�jaslap�</link>, vai izlasi pilnu <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">aktu</link>."
+
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Apvieno un sadali daž�dus kontaktus, vien� vesel�."
+
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Apvienot un sadalīt kontaktus"
+
+#: 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 ""
+"Ja vienam vai vair�kiem kontaktiem ir vair�ki konti ar daž�diem tērzēšanas "
+"servisiem, tu vari apvienot šos kontaktus vien�."
+
+#: 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 ""
+"Iegūtais kontakts tiek saukts par <em>meta-kontaktu</em>: kontakts, "
+"savienots no vair�kiem atsevišķiem kontaktiem."
+
+#: C/link-contacts.page:34(page/p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+"Ja tev ir Ilzes Priedes kontakts, kurš izmanto trīs daž�dus ziņojumu "
+"servisus, piemēram:"
+
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "ilze@facebook"
+
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "ilze.priede@gmail"
+
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "ilze_priede@hotmail"
+
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Tu vari apvienot šos kontaktus vien� vienīg� Ilzes Priedes kontakt�."
+
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Kontaktu apvienošana"
+
+#: C/link-contacts.page:63(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>."
+msgstr ""
+"No <gui>Kontaktu saraksta</gui> loga, spiež labo peles pogu uz kontakta ar "
+"daž�diem kontiem un izvēlies <gui style=\"menuitem\">Saistīt kontaktus...</"
+"gui>."
+
+#: C/link-contacts.page:70(item/p)
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"No kreis� paneļa, <gui>Saistīt kontaktus</gui> log�, izvēlies kontaktus, "
+"kurus vēlies apvienot."
+
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Spied uz <gui style=\"button\">Saistīt</gui>."
+
+#: C/link-contacts.page:82(note/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 ""
+"Kad ir izveidots meta-kontakts, noklusētais kontakts, kurš tiks izmantots, "
+"lai sazin�tos, kad uz t� veic dubultklikšķi, būs kontakts ar augst�ko "
+"kl�tbūtnes laiku."
+
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "Kontaktu atdalīšana"
+
+#: C/link-contacts.page:94(item/p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"<gui>Kontaktu saraksts</gui> log� spiež labo peles pogu uz kontakta, kuru "
+"vēlies atdalīt un izvēlies <gui style=\"menuitem\">Saistīt kontaktus...</"
+"gui>."
+
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Spied uz <gui style=\"button\">Atsaistīt</gui>."
+
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "P�rlūko vai meklē sav�s iepriekšēj�s sarun�s."
+
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Skatīt iepriekšēj�s sarunas"
+
+#: C/prev-conv.page:38(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."
+msgstr ""
+"<app>Empathy</app> autom�tiski saglab� visas teksta sarunas, kuras notiek "
+"starp kontaktiem. Tu vari <link xref=\"#search\">meklēt caur vis�m sav�m "
+"iepriekšēj�m sarun�m</link> vai <link xref=\"#browse\">skatīt iepriekšēj�s "
+"sarunas</link>, šķirojot t�s pēc kontakta un datuma."
+
+#: C/prev-conv.page:46(note/p)
+msgid ""
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr ""
+"Nav vajadzīgs savienojums ar internetu, lai skatītos un meklētu iepriekšēj�s "
+"sarunas."
+
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Meklēt iepriekšēj�s sarunas"
+
+#: C/prev-conv.page:55(section/p)
+msgid ""
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr ""
+"Tu vari veikt pilnu teksta meklēšanu caur vis�m sav�m iepriekšēj�m sarun�m."
+
+#: 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 ""
+"No <gui>Kontaktu saraksts</gui> loga, izvēlies <guiseq><gui>Skats "
+"</gui><gui>Iepriekšēj�s sarunas</gui></guiseq>, vai arī, spied <key>F3</key>"
+
+#: C/prev-conv.page:63(item/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 ""
+"Izvēlies kontu no saraksta augšpusē. Saraksts ar kontaktiem un tērzēšanas "
+"istab�m konkrētajam kontam tiks par�dīts zem�k."
+
+#: C/prev-conv.page:67(item/p)
+msgid ""
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Teksta lauk� <gui>Meklēt</gui> ievadi tekstu, ko vēlies atrast."
+
+#: C/prev-conv.page:71(item/p)
+msgid ""
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
+msgstr ""
+"Tiks r�dīta katras saruna, kas atbilst meklētajam tekstam. Pēc noklusējuma "
+"sarunas ir k�rtotas pēc datuma."
+
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Skatīt iepriekšēj�s sarunas"
+
+#: C/prev-conv.page:82(section/p)
+msgid ""
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr ""
+"Iepriekšēj�s sarunas ar saviem kontaktiem vai tērzēšanas istab�m var "
+"p�rlūkot pēc datuma."
+
+#: C/prev-conv.page:91(item/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 ""
+"Izvēlies kontu no izkrītoš�s izvēlnes augš� kreisaj� pusē. Saraksts ar "
+"kontaktiem un tērzēšanas istab�m konkrētajam kontam tiks par�dīts zem�k."
+
+#: C/prev-conv.page:95(item/p)
+msgid ""
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr ""
+"Izvēlies kontaktu vai tērzēšanas istabu, kuru iepriekšēj�s sarunas vēlies "
+"skatīties. Pēc noklusējuma, liel�k� daļa pēdējo sarunu tiks par�dītas."
+
+#: C/prev-conv.page:99(item/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 ""
+"Savas sarunas vari skatīties, šķirojot pēc datumiem. Dienas, kur�s tev ir "
+"bijusi k�da saruna ar izvēlēto kontaktu, tiks iezīmētas treknrakst�. Spied "
+"uz datuma, lai to izvēlētos. Spied uz bultiņ�m pie mēneša un gada, lai "
+"skatītu agr�kus datumus."
+
+#: 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 ""
+"Meklēt teksta sarun�s var, rakstot meklēšanas lauciņ� augšpusē. Tiks r�dītas "
+"atbilstoš�s sarunas."
+
+#: C/prev-conv.page:111(note/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 ""
+"Iepriekšēj�s sarunas ar k�du no kontaktiem var �tri apskatīt no "
+"<gui>Kontaktu saraksts</gui> loga. Spied labo peles pogu uz kontakta un "
+"izvēlies <gui>Iepriekšēj�s sarunas</gui>. Atvērsies <gui>Iepriekšēj�s "
+"sarunas</gui> logs ar sarun�m ar izvēlēto kontaktu."
+
+#: C/prob-conn-acctdisabled.page:7(info/desc)
+msgid ""
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr "Tērzēšanas konts, ko vēlies izmantot, nav aktivēts kontaktu sarakst�."
+
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "Mans konts nav aktivēts"
+
+#: C/prob-conn-acctdisabled.page:36(page/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 ""
+"Ja tērzēšanas konts, ko vēlies izmantot, nav aktivēts kontu sarakst�, "
+"mēģinot s�kt jaunu sarunu vai pievienojoties k�dai istabai, tad  inform�cija "
+"par tavu kontu varētu būt nepareiza."
+
+#: 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 "P�rliecinies, ka ir savienojums ar internetu vai ar lok�lo tīklu."
+
+#: 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 ""
+"Izvēlies <guiseq><gui>Rediģēt</gui><gui>Konti</gui></guiseq> un izvēlies "
+"kontu, kurš nestr�d�."
+
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+msgid ""
+"Type your username and password again to make sure that they are correct."
+msgstr "P�rliecinies, ka lietot�jv�rdu un paroli esi ievadījis pareizi."
+
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/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 ""
+"P�rbaudi, ka visa inform�cija, <gui>Paplašin�ti</gui> sadaļ� ir pareiza. Tev "
+"vajadzētu atrast šo inform�ciju m�jaslap�, kuras ziņojumu servisu izmanto."
+
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "P�rliecinies, ka konts ir ieslēgts."
+
+#: C/prob-conn-auth.page:8(info/desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>� appears in "
+"the main window."
+msgstr ""
+"Kļūdas paziņojums, ka  “<gui>Autentifik�cija neizdev�s</gui>� par�d�s "
+"galvenaj� log�."
+
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Es saņemu paziņojumu, ka \"Autentifik�cija neizdev�s\""
+
+#: 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 ""
+"Šis kļūdas tips notiek tad, kad tavs tērzēšanas serviss neatļauj "
+"savienoties, jo neatpazīst tavu lietot�jv�rdu vai paroli k�da iemesla dēļ."
+
+#: 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 ""
+"P�rliecinies, ka servisam, kuram mēģini pieslēgties, ir izveidots konts. Ja "
+"tev nav izveidots konts, vairums servisu neatļaus tev ar tiem savienoties."
+
+#: 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 ""
+"Nospied uz <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+"png\">rediģēt</media> ikonas, kļūdas paziņojum�."
+
+#: 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 ""
+"Atslēdz opciju <gui>Aktivēts</gui> un tad ieslēdz to vēlreiz, lai mēģin�tu "
+"atkal savienoties ar servisu."
+
+#: C/prob-conn-name.page:9(info/title)
+#| msgid "“Name in use�"
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "\"V�rds jau ir aizņemts\""
+
+#: 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 ""
+"Kļūdas paziņojums, kurš nor�da \"<gui>V�rds jau ir aizņemts</gui>\" par�d�s "
+"galvenaj� log�."
+
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Es saņemu paziņojumu, ka \"V�rds jau ir aizņemts\""
+
+#: 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 ""
+"Šī kļūda notiek, kad tu mēģini savienoties ar savu IRC kontu un tu izmanto "
+"segv�rdu kuru ir aizņēmis k�ds cits dotaj� tīkl�."
+
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "<gui>Iesauka</gui> teksta lauk�, ieraksti jaunu segv�rdu."
+
+#: 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 ""
+"Ja esi reģistrējis segv�rdu konkrētaj� tīkl�, kuru izmanto, uzliec tam "
+"paroli. Lai uzzin�tu vair�k, lasi <link xref=\"irc-nick-password\"/>."
+
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+msgid ""
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
+msgstr ""
+"Izslēdz kontu un pēc tam atkal to ieslēdz, lai mēģin�tu atkal savienoties ar "
+"servisu."
+
+#: C/prob-conn-neterror.page:7(info/desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
+msgstr ""
+"Kļūdas paziņojums, kurš saka “<gui>Tīkla kļūda</gui>� par�d�s galvenaj� log�."
+
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Es saņemu \"Tīkla kļūda� ziņojumu"
+
+#: C/prob-conn-neterror.page:42(page/p)
+msgid ""
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
+msgstr ""
+"Š�da kļūda notiek tad, kad <app>Empathy</app> nevar sazin�ties ar TZ "
+"serveri, k�da iemesla dēļ."
+
+#: 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 ""
+"K� arī, šī kļūda notiek tad, kad mēģini izmantot IRC kontu bez segv�rda "
+"iestatīšanas."
+
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Starpniekserveru atbalsts"
+
+#: 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 ""
+"Šobrīd <app>Empathy</app> nevar nokonfigurēt t�, lai tas str�d�tu caur "
+"starpniekserveri."
+
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Identificē biež�k�s problēmas, kas rodas, savienojoties ar k�du TZ servisu."
+
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problēmas, savienojoties ar TZ servisu"
+
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Izņem kontu no <app>Empathy</app> pilnīb�."
+
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Izņemt kontu"
+
+#: 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 ""
+"Ja vair�k nevēlies izmantot savu kontu, to var pilnīb� izņemt no "
+"<app>Empathy</app> lietotnes. Ja vēlēsies izmantot savu kontu atk�rtoti, tev "
+"vajadzēs atkal ievadīt visu inform�ciju."
+
+#: 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 ""
+"Izvēlies kontu, ko vēlies izņemt, no kontu saraksta kreisaj� loga pusē."
+
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Spied <gui style=\"button\">-</gui>."
+
+#: 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 ""
+"Par�dīsies logs, kur� tev prasīs apstiprin�jumu. Spied <gui>Izņemt</gui> "
+"pogu, lai pilnīb� izņemtu savu kontu."
+
+#: 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 ""
+"Pat pēc konta izņemšanas <app>Empathy</app> nedzēsīs tavu sarunu vēsturi."
+
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "People Nearby pakalpojuma saprašana."
+
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Kas ir People Nearby?"
+
+#: 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 ""
+"People Nearby serviss ir bez-servera komunik�cijas serviss: tev nevajag "
+"savienoties un autentificēties ar centr�lo serveri, lai to izmantotu."
+
+#: 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 ""
+"Š�ds saziņas veids ir iespējams tikai lok�laj� tīkl� un tam nav nepieciešams "
+"aktīvs interneta savienojums."
+
+#: 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 ""
+"Cilvēki, kuri izmanto šo servisu vien� lok�laj� tīkl� autom�tiski tiks "
+"par�dīti, un tiem varēsi nosūtīt ziņas un failus tieši t� pat, k� izmantojot "
+"citus servisus."
+
+#: C/salut-protocol.page:54(page/p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Visiem modernajiem lok�lajiem tīkliem būtu j�būt spējīgiem atbalstīt š�du "
+"servisu."
+
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Nosūti failu no sava datora k�dam kontaktam."
+
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Sūtīt failus"
+
+#: C/send-file.page:45(item/p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr ""
+"Veic labo peles klikšķi uz kontakta, kuram vēlies sūtīt failu un izvēlies "
+"<gui>Sūtīt failu</gui>."
+
+#: 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 ""
+"Spied uz kontakta, kuram vēlies sūtīt failu un izvēlies <guiseq><gui>Rediģēt "
+"</gui><gui>Kontakts</gui><gui>Sūtīt failu</gui></guiseq>."
+
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Izvēlies failu, kuru vēlies sūtīt, un spied uz <gui>Sūtīt</gui>."
+
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Par�dīsies <gui>Failu p�rsūtījumu</gui> logs."
+
+#: C/send-file.page:66(item/p)
+msgid ""
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr ""
+"Gaidi, kamēr tavs kontakts pieņems faila sūtījumu, vai nospied <gui>Apturēt</"
+"gui>, lai apst�din�tu sūtīšanu."
+
+#: 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 ""
+"Kolīdz p�rsūtīšana ir pabeigta, var aizvērt <gui>Failu p�rsūtījumi</gui> "
+"logu."
+
+#: 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 ""
+"Ja sarakst� ir vair�ki pabeigti sūtījumi, spied uz <gui>Attīrīt</gui>, lai "
+"nodzēstu sarakstu. Tas tikai izdzēsīs failus no saraksta, bet ne no tava "
+"datora."
+
+#: 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 ""
+"Failus var sūtīt, izmantojot tikai sekojošos servisus: <em>Jabber</em>, "
+"<em>Google Talk</em> un <em>People Nearby</em>."
+
+#: C/send-file.page:93(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."
+msgstr ""
+"lai k�dam nosūtītu failu, ir j�būt savienojumam ar internetu vai ar lok�lo "
+"tīklu."
+
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Sūti ziņu k�dam no saviem kontaktiem."
+
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Sūtīt k�dam ziņu"
+
+#: C/send-message.page:36(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."
+msgstr ""
+"No <gui>Kontaktu saraksta</gui> loga, veic dubultklikšķi uz kontakta v�rda, "
+"ar ko vēlies s�kt sarunu."
+
+#: 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 ""
+"Atvērsies jauns logs. Ieraksti ziņojumu teksta laukum�, loga lejasdaļ� un "
+"nospied <key>Enter</key>, lai to nosūtītu."
+
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Nosūtīt ziņu meta-kontaktam"
+
+#: C/send-message.page:58(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Izvēlies kontaktu, ar kuru vēlies uzs�kt sarunu un no izvēlnē izvēlies <gui "
+"style=\"menuitem\">Tērzēt</gui>."
+
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Pievieno, rediģē vai dzēs personīg�s ziņas no sava statusa."
+
+#: 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 "Iestatīt piel�gotu ziņojumu"
+
+#: C/set-custom-status.page:36(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."
+msgstr ""
+"Daž�dos gadījumos varētu vēlēties iestatīt piel�gotu ziņojumu savam "
+"statusam, piemēram paust kontaktiem zin�mu to, ka k�du laiku nebūsi pieejams."
+
+#: C/set-custom-status.page:40(page/p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"Piel�gotu ziņojumu var iestatīt atkarīb� no daž�dajiem pieejamajiem "
+"statusiem."
+
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr ""
+"No <gui>Kontaktu saraksts</gui> loga, izvēlies krītošo izvēlni, kura ir "
+"augšpusē."
+
+#: C/set-custom-status.page:52(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>."
+msgstr ""
+"Izvēlies statusu, kuram vēlies iestatīt piel�gotu ziņojumu. Tev vajag "
+"izvēlēties to, kurš ir apzīmēts k� <gui>Piel�gots ziņojums</gui>."
+
+#: 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 ""
+"Ievadi savu piel�goto ziņojumu teksta lauk�, loga augšpusē un nospied "
+"taustiņu <key>Enter</key>, lai šo ziņojumu iestatītu."
+
+#: 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 ""
+"Ja vēlies saglab�t piel�goto ziņojumu, lai to izmantotu atkal vēl�k, spied "
+"uz mazo sirsniņu pa labi no teksta lauka, kur� ievadīj�t piel�goto ziņojumu."
+
+#: C/set-custom-status.page:69(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."
+msgstr ""
+"Ja to neizdarīsi, piel�gotais ziņojums nebūs pieejams, n�kamreiz atverot "
+"<app>Empathy</app>. Tas tiks saglab�ts tikai šaj� sesij�."
+
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "Rediģēt un izņemt piel�gotu ziņojumu"
+
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Izvēlies <gui>Labot piel�gotos ziņojumus</gui>."
+
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Lai labotu piel�goto ziņojumu:"
+
+#: C/set-custom-status.page:100(item/p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr ""
+"No <gui>Saglab�tie iepriekšnoteiktie</gui> kastes, izvēlies statusa "
+"ziņojumu, kuru vēlies labot, un veic uz t� dubultklikšķi."
+
+#: C/set-custom-status.page:106(item/p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr ""
+"Ievadi jaunu piel�goto ziņojumu un nospied <key>Enter</key>, lai to mainītu."
+
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Lai izņemtu piel�goto ziņojumu:"
+
+#: C/set-custom-status.page:118(item/p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"No <gui>Saglab�tie iepriekšnoteiktie</gui> kastes, izvēlies statusa "
+"ziņojumu, kuru vēlies izņemt."
+
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Nospied uz <gui>Izņemt</gui> pogas."
+
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Kad esi pabeidzis, spied uz <gui>Aizvērt</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 ""
+"Rediģējot piel�gotu ziņojumu, tas netiks iestatīts k� pašreizēj� statusa "
+"ziņojums. Tas j�izvēlas no <gui>Kontaktu saraksta</gui> loga."
+
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Par�di savu darbvirsmu saviem kontaktiem."
+
+#: 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 "Dalīties ar savu darbvirsmu"
+
+#: C/share-desktop.page:35(page/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 ""
+"Savu darbvirsmu var koplietot ar dažiem no saviem kontaktiem. Tu vari "
+"izmantot šo funkciju, lai par�dītu savu darbvirsmu kontaktiem, piemēram, lai "
+"paprasītu palīdzību k�d� problēm�."
+
+#: C/share-desktop.page:42(note/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 ""
+"Lai varētu dalīties ar darbvirsmu, šaj� sistēm� j�būt uzinstalētam VNC "
+"serverim, kurš atbalsta šo pakalpojumu. <app>Vino</app> — GNOME veidotajam "
+"VNC serverim — ir š�das atbalsts."
+
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "<gui>Kontaktu saraksts</gui> log� veic vienu no sekojošaj�m darbīb�m:"
+
+#: 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 ""
+"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 ""
+"Izvēlies kontaktu ar kuru vēlies dalīt savu darbvirsmu un izvēlies <guiseq><"
+"gui>Rediģēt</gui><gui>Kontakts</gui><gui>Dalīties ar darbvirsmu</gui></"
+"guiseq>."
+
+#: 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 ""
+"Ar labo peles klikšķi nospied uz kontakta, ar kur vēlies dalīt darbvirsmu un "
+"izvēlies <gui>Dalīties ar darbvirsmu</gui>."
+
+#: C/share-desktop.page:71(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."
+msgstr ""
+"Ielūgums skatīties tavu darbvirsmu tiks nosūtīts izvēlētajam kontaktam. Lai "
+"varētu skatīties tavu darbvirsmu, kontaktam vajadzēs pieņemt ielūgumu."
+
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr ""
+"Tu vari atvienot kontaktu no savas darbvirsmas, izmantojot savu darbvirsmas "
+"koplietošanas lietotni."
+
+#: C/share-desktop.page:82(note/p)
+msgid ""
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
+msgstr ""
+"Lai uzzin�tu vair�k, k� izmantot darbvirsmas koplietošanas lietotnes, lasiet "
+"to dokument�ciju."
+
+#: 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 ""
+"Daloties ar savu darbvirsmu, ir iespējama sistēmas palēnin�šan�s un zem�ks "
+"interneta �trums."
+
+#: C/share-desktop.page:96(note/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 ""
+"Dažiem no taviem kontaktiem var nebūt iespējas izmantot šo pakalpojumu. Viņu "
+"<app>Empathy</app> versijai ir j�būt vismaz 2.28. un savietojama darbvirsmas "
+"koplietošanas/skatīšanas lietotne."
+
+#. 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'"
+
+#. 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 ""
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr ""
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Daž�do statusu un statusu ikonu izprašana."
+
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "Statusu tipi un ikonas"
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Available icon</media> <gui>Available</gui>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">\"Pieejams\" ikona</media> <gui>Pieejams</gui>"
+
+#: C/status-icons.page:41(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."
+msgstr ""
+"Izmanto <em>Pieejams</em> statusu kad atrodies pie sava datora un esi "
+"spējīgs sazin�ties ar kontaktiem. Šim statusam var iestatīt paša izvēlētu "
+"ziņojumu."
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</"
+"media> <gui>Busy</gui>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">"
+"\"Aizņemts\" ikona</"
+"media> <gui>Aizņemts</gui>"
+
+#: C/status-icons.page:47(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."
+msgstr ""
+"Izmanto <em>Aizņemts</em> statusu, lai darītu saviem kontaktiem zin�mu, ka "
+"nevēlies pašlaik sazin�ties. Viņi joproj�m var ar tevi sazin�ties, piemēram, "
+"ja ir j�pasaka kas steidzams. Pēc noklusējuma, <app>Empathy</app> neizmantos "
+"paziņojumu burbuļus un skaņas, kad ir uzlikts šis statuss. Šim statusam vari "
+"iestatīt paša izvēlētu ziņojumu."
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</"
+"media> <gui>Away</gui>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">\"Prom\" "
+"ikona</"
+"media> <gui>Prom</gui>"
+
+#: C/status-icons.page:55(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."
+msgstr ""
+"Izmanto <em>Prom</em> statusu, kad dodies prom no datora. <app>Empathy</app> "
+"autom�tiski jums uzliks šo statusu, ja k�du laiku nebūsi izmantojis datoru, "
+"vai, ja ekr�nsaudzēt�js būs aktīvs. Pēc noklusējuma, <app>Empathy</app> "
+"neizmantos paziņojumu burbuļus un skaņas, kad ir uzlikts šis statuss. Šim "
+"statusam var uzst�dīt paša izvēlētu ziņojumu."
+
+#: 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\">"
+"\"Nesaistē\" "
+"ikona</media> <gui>Neredzams</gui>"
+
+#: 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 ""
+"Kad statuss ir <em>Neredzams</em>, tavi kontakti redzēs, ka esi nesaistē."
+"Taj� pat laik� tu vēl joproj�m būsi savienots ar visiem kontiem, un tu "
+"varēsi redzēt savu kontaktu statusus, k� arī ar viņiem sazin�ties."
+
+#: 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 ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Offline</gui>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">"
+"\"Nesaistē\" "
+"ikona</media> <gui>Nesaistē</gui>"
+
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr ""
+"Savu konta statusu iestatīšana uz <em>Nesaistē</em>, atvieno tevi no visiem "
+"taviem kontiem."
+
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "S�kt video sarunu ar vienu no kontaktiem."
+
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "S�kt video sarunu"
+
+#: C/video-call.page:31(page/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 ""
+"Ja tev ir tīmekļa kamera, tu vari sazvanīt savus kontaktus un veikt video "
+"sarunas ar tiem. Šī iespēja darbojas tikai ar noteikta veida kontiem un "
+"otram sarunas dalībniekam j�būt lietotnei, kas atbalsta video zvanus."
+
+#: C/video-call.page:38(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\">Video Call</gui>."
+msgstr ""
+"<gui>Kontaktu saraksta</gui> log� spied uz <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">video zvans</media> ikonas "
+"pretī kontakta v�rdam, kuram vēlies zvanīt un izvēlies <gui style=\"menuitem"
+"\">Video zvans</gui>."
+
+#: C/video-call.page:55(note/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 ""
+"Lai p�rvērstu video zvanu par audio sarunu, izvēlies <guiseq><gui style="
+"\"menu\">Video</gui><gui style=\"menuitem\">Izslēgt video</gui></guiseq>."
+
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "S�kt video sarunu ar meta-kontaktu"
+
+#: 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 ""
+"Izvēlies kontaktu, ar kuru vēlies sazin�ties un izvēlnē izvēlies <gui style="
+"\"menuitem\">Video zvans</gui>."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "'Pieejams' ikona"
+
+#~ msgid "Available"
+#~ msgstr "Pieejams"
+
+#~ msgid "Busy icon"
+#~ msgstr "'Aizņemts' ikona"
+
+#~ msgid "Busy"
+#~ msgstr "Aizņemts"
+
+#~ msgid "Away icon"
+#~ msgstr "'Prom' ikona"
+
+#~ msgid "Away"
+#~ msgstr "Prom"
+
+#~ msgid "Offline icon"
+#~ msgstr "'Nesaistē' ikona"
+
+#~ msgid "Invisible"
+#~ msgstr "Neredzams"
+
+#~ msgid "Offline"
+#~ msgstr "Nesaistē"
+
+#~ 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 "Es gribētu redzēt šeit vair�k inform�cijas."
+
+#~ 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 vair�k neatļauj izveidot IRC kontu bez derīga segv�rda. Esmu "
+#~ "izņēmis pam�cības saiti. Izņemiet tekstu."
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "Instalēt telepathy-idle"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "Ikona audio sarunai"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "Ikona video sarunai"
+
+#, fuzzy
+#~ 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 ""
+#~ "Es vēlētos veidot š�da veida tabulas, neizmantojot neko Nē viet� un ✔ J� "
+#~ "viet�, ta�u mums j�ņem vēr�, ka tas var ieteikmēt pieejamību. Es esmu "
+#~ "<link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/"
+#~ "msg00006.html\">pajaut�jis pieejamības komandai</link> par so gadījumu."
+
+#, fuzzy
+#~ 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 ""
+#~ "Pēdēj� laik� tiek str�d�ts pie telepathy-butterfy un papyon, lai tie "
+#~ "atbalstītu audio saziņu, un pie MSN, lai tas atbalstītu video saziņu. Šis "
+#~ "darbs varētu tikt pabeigts laik�, lai palaistu to kop� ar 2.28 versiju, "
+#~ "ta�u t�, k� tas neseko Gnome palaišanas grafikiem, es neesmu par to "
+#~ "p�rliecin�ts. Ja tas izskat�s, ka būs gatavs, atzīmēsim to k� J�."
+
+#~ msgid "Resource"
+#~ msgstr "Resurss"
+
+#~ msgid "Priority"
+#~ msgstr "Priorit�te"
+
+#~ msgid "Network"
+#~ msgstr "TÄ«kls"
+
+#~ msgid "Nickname"
+#~ msgstr "Iesauka"
+
+#~ msgid "Password"
+#~ msgstr "Parole"
+
+#~ msgid "Quit message"
+#~ msgstr "Iziešanas ziņa"
+
+#~ msgid "Charset"
+#~ msgstr "Rakstzīmju kopa"
+
+#~ msgid "Servers"
+#~ msgstr "Serveri"
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 61dea1f53..9f3f4c592 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy manual\n"
-"POT-Creation-Date: 2012-01-10 13:23+0000\n"
+"POT-Creation-Date: 2012-03-08 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrej Žnidarši� <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
@@ -17,2255 +17,2349 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\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"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Andrej Žnidarši� <andrej.znidarsic@gmail.com>"
+
+#. 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 "external ref='figures/empathy-logo.png' md5='1afc419a644e90b16393807e35cb5cb2'"
+
+#: C/index.page:7(info/title)
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy hipni sporo�ilnik"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Za�nite video pogovor z enim od vaših stikov"
+#: C/index.page:8(info/title)
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy hipni sporo�ilnik"
 
-#: 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: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 "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0"
 
-#: C/video-call.page:29(title)
-msgid "Start a video conversation"
-msgstr "Za�enjanje video konference"
-
-#: 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 "V primeru da imate spletno kamero, lahko svoje stike pokli�ite in imate z njimi video pogovor. Ta zmožnost deluje le z dolo�enimi vrstami ra�unov in zahteva, da ima druga oseba program, ki podpira video klice."
-
-#: 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 "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati, in izberite <gui style=\"menuitem\">Video klic</gui>. Namesto tega lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</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 "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli <gui>Povezano</gui> skupaj s celotnim �asom pogovora."
+#: C/index.page:27(page/title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">Logotip hipnega sporo�ilnika Empathy</media> Empathy hipni sporo�ilnik"
 
-#: 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 "Za kon�anje pogovora izberite <guiseq><gui style=\"menu\">Klic</gui><gui style=\"menuitem\">Odloži</gui></guiseq>."
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Upravljanje z ra�uni"
 
-#: 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 "Za pretvorbo video pogovora v zvo�ni pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Izklopi</gui></guiseq>."
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Upravljanje stikov"
 
-#: C/video-call.page:61(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Za�nite video pogovor z enim od svojih meta-stikov"
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Besedilni pogovori"
 
-#: 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 "V oknu <gui>Seznam stikov</gui> desno kliknite na meta-stik."
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Zvo�ni in video pogovori"
 
-#: 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 "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Napredna dejanja"
 
-#: 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 "Če želite videti ali je stik <em>meta-stik</em>, premaknite miško na stik v oknu <gui>Seznam stikov</gui> in se nad njim za trenutek zaustavite: pojavilo se bo majhno sporo�ilo, ki prikazuje število stikov, ki tvorijo meta-stik."
+#: C/index.page:55(section/title)
+#: C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Pogoste težave"
 
-#. 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 "Razumevanje razli�nih stanj in ikon stanja."
+#. 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 "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)
+msgctxt "_"
+msgid "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+msgstr "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+
+#. 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 "external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
+
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Dodatni podatki, potrebni za povezovanje z omrežji 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 "Vrste stanj in ikone"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Ikona stanja na voljo"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Na voljo"
-
-#: 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 "Stanje <em>Na voljo</em> uporabite, ko ste za ra�unalnikom in zmožni klepetati s svojimi stiki. Za to stanje lahko nastavite sporo�ilo po meri."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Ikona zasedenosti"
-
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Zaseden"
-
-#: 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 "Uporabite stanje <em>Zaposlen</em> da bodo vaši stiki vedeli, da trenutno ne želite klepetati. Še vedno lahko vzpostavijo stik z vami, na primer �e želijo razpravljati o ne�em nujnem. Privzeto <app>Empathy</app> ne uporablja zvokov in balonskih opomnikov, ko ste zaposleni. Za to stanje lahko nastavite sporo�ilo po meri."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Ikona odsotnosti"
-
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Odsoten"
-
-#: 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 "Stanje <em>Odsoten</em> uporabite, ko greste pro� od ra�unalnika. <app>Empathy</app> vaše stanje samodejno nastavi na odsoten, �e ra�unalnika nekaj �asa ne uporabljate ali �e je vklopljen vaš ohranjevalnik zaslona. Privzeto <app>Empathy</app> ne bo uporabljal zvokov in obvestilnih balon�kov, ko ste odsotni. Za to stanje lahko nastavite sporo�ilo po meri."
-
-#: C/status-icons.page:62(media)
-#: C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Ikona nepovezanosti"
-
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Neviden"
-
-#: 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 "Ko nastavite svoje stanje na <em>Nevidno</em>, boste za vaše stike videti nepovezani. Še vedno boste povezani s svojimi ra�uni in še vedno boste videli stanja svojih stikov in lahko za�eli pogovore z njimi. "
-
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Nepovezano"
-
-#: C/status-icons.page:71(p)
-msgid "Setting your status to <em>Offline</em> disconnects you from all of your accounts."
-msgstr "Nastavitev vašega stanja na <em>Nepovezano</em> prekine povezavo z vsemi vašimi ra�uni."
-
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Dajte namizje v souporabo s svojimi stiki."
-
-#: 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"
-
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Dajte vaše namizje v souporabo"
-
-#: 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 "Z nekaterimi stiki je mogo�e dati svoje namizje v souporabo ali za�eti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vašim stikom, za iskanje pomo�i ali za pomo� svojim stikom pri odpravljanju težav."
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "Podrobnosti ra�una IRC"
 
-#: 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 "Za zmožnost souporabe namizja boste morali imeti nameš�en strežnik VNC z ustrezno podporo. <app>Vino</app>, GNOME strežnik VNC ima zahtevano podporo."
+#: 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 "Ra�uni IRC zahtevajo druga�ne podatke kot veliko drugih vrst ra�unov. Za ustvarjanje ra�una IRC morate navesti vsaj omrežje IRC in vzdevek. Ta stran vsebuje podrobnosti, ki jih lahko navedete za vaš ra�un IRC."
 
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
+#: 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 "Za uporabo IRC-a v <app>Empathy</app> morate imeti nameš�en paket <sys>telepathy-idle</sys>."
 
-#: 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 "Izberite stik kateremu želite dati svoje namizje v souporabo in izberite  <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Daj moje namizje v souporabo</gui></guiseq>."
+#: C/account-irc.page:45(item/title)
+#: C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr "<gui>Omrežje</gui>"
 
-#: 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 "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in izberite <gui>Daj moje namizje v souporabo</gui>."
+#: C/account-irc.page:46(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."
+msgstr "IRC je odprt sistem, ki ljudem omogo�a poganjanje lo�enih omrežij IRC. Vsako omrežje je lo�eno in ima svoje uporabnike in klepetalnice. <app>Empathy</app> v spustnemu seznamu <gui>Omrežje</gui> vsebuje najbolj priljubljena omrežja. Dodate lahko dodatna omrežja. Oglejte si <link xref=\"#networks\"/> spodaj."
 
-#: 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 "Povabilo za ogled vašega namizja bo bilo poslano izbranemu stiku. Za ogled vašega namizja ga bo moral sprejeti."
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Vzdevek</gui>"
 
-#: C/share-desktop.page:77(p)
-msgid "You can disconnect the contact from your computer using your desktop sharing application."
-msgstr "Povezavo stika s svojim oddaljenim namizjem lahko prekinete s programom souporabe namizja."
+#: C/account-irc.page:54(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."
+msgstr "Vaš vzdevek je vaše edinstveno ime na omrežju IRC. Le ena oseba na omrežju lahko uporablja dani vzdevek. V primeru da dobite sporo�ilo napake <link xref=\"prob-conn-name\" role=\"error-msg\"/> boste morali spremeniti svoj vzdevek."
 
-#: C/share-desktop.page:82(p)
-msgid "For more information about how to use the remote desktop sharing application, refer to its help."
-msgstr "Za ve� podrobnosti kako uporabiti program oddaljenega pregledovalnika namizja se sklicujte na pomo�."
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Geslo</gui>"
 
-#: 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 "Ko svoje namizje date v souporabo z nekom drugim, boste morda opazili upo�asnjeno delovanje sistema in nizko hitrost medmrežja."
+#: C/account-irc.page:61(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."
+msgstr "Nekateri strežniki, še posebno tisti na zasebnih omrežjih zahtevajo geslo za povezavo. V primeru da ste overjeni za uporabo omrežja, vam bodo skrbniki omrežja priskrbeli geslo. "
 
-#: 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 "Vsi stiki morda ne podpirajo te zmožnosti. Stiki morajo imeti vsaj <app>Empathy</app> razli�ico 2.28 in na svojemu sistemu nameš�en program pregledovalnika oddaljenega namizja."
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "Gelsa NickServ"
 
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Dodajanje, urejanje ali brisanje osebnih sporo�il za vaša stanja."
+#: C/account-irc.page:66(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."
+msgstr "Na nekaterih omrežjih je vzdevke mogo�e ustvariti z uporabo storitve NickServ. <app>Empathy</app> gesel vzdevkov ne podpira neposredno. Na nekaterih omrežjih, vklju�no s priljubljenim omrežjem FreeNode, so strežniška gesla samodejno posredovana NickServ, kar vam omogo�a nastavitev tega polja za identifikacijo z NickServ. Za ve� podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
 
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+#: C/account-irc.page:76(item/title)
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Pravo ime</gui>"
 
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+#: C/account-irc.page:77(item/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."
+msgstr "Poleg vašega vzdevka lahko navedete tudi svoje pravo ime. Ostali uporabniki ga bodo lahko videli, ko si ogledajo vaše podrobnosti."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Nastavitev sporo�ila po meri"
+#: C/account-irc.page:81(item/title)
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Sporo�ilo kon�anja</gui>"
 
-#: 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 "V�asih si morda želite nastaviti sporo�ilo po meri za vaše stanje, na primer da ljudem sporo�ite da dolo�en �as ne boste na voljo."
+#: 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 "Ko prekinete povezavo, je sporo�ilo kon�anja poslano vsem klepetalnicam, v katerih ste in vsem uporabnikom s katerimi imate zasebni pogovor. Uporabite to polje za sporo�ilo kon�anja po meri."
 
-#: C/set-custom-status.page:40(p)
-msgid "It is possible to set a custom message based on the different statuses available."
-msgstr "Sporo�ilo po meri je mogo�e nastaviti na osnovi razli�nih razpoložljivih stanj."
+#: C/account-irc.page:94(info/title)
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "Omrežja IRC"
 
-#: 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 "V oknu <gui>Seznam stikov</gui> kliknite na spustni seznam na vrhu."
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Omrežja"
 
-#: 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 "Izberite stanje, kateremu želite dodati sporo�ilu po meri. Izbrati morate sporo�ilo z oznako <gui>Sporo�ilo po meri</gui>."
+#: C/account-irc.page:99(section/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."
+msgstr "<app>Empathy</app> vklju�uje seznam priljubljenih omrežij IRC. V primeru da želite uporabljati drugo omrežje IRC ga lahko dodate na seznam. Omrežja lahko tudi spreminjate in jih odstranjujete s seznama. You can also modify networks and remove them from the list."
 
-#: 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 "V besedilno polje na vrhu okna vnesite sporo�ilo po meri in pritisnite <key>Enter</key> za nastavitev sporo�ila. "
+#: C/account-irc.page:104(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>."
+msgstr "Za dodajanje omrežja na seznamu kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Dodaj</media>."
 
-#: 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 "V primeru da želite nastaviti sporo�ilo po meri kot priljubljeno in ga shraniti za ponovno uporabo, kliknite na majhno zvezdico na desni besedilnega polja, kjer ste napisali sporo�ilo po meri. "
+#: 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 "Za spremembo omrežja v seznamu izberite omrežje in kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Uredi</media>."
 
-#: 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 "V primeru da tega ne storite sporo�ilo ne bo na voljo, ko naslednji� uporabite <app>Empathy</app>. Shranjeno bo le za trenutno sejo."
+#: C/account-irc.page:110(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>."
+msgstr "Za odstranitev omrežja s seznama izberite omrežje in kliknite  <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">Odstrani</media>."
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Urejanje, odstranjevanje in dodajanje sporo�ila po meri"
+#: C/account-irc.page:115(section/p)
+msgid "When adding or modifying a network, you can enter the following information:"
+msgstr "Ob dodajanju ali spreminjanju omrežja lahko vnesete naslednje podatke:"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Izberite <gui>Uredi sporo�ilo po meri</gui>."
+#: C/account-irc.page:121(item/p)
+msgid "This is the name of the network as you want it to appear in the list of networks."
+msgstr "To je ime omrežja, ki se bo pojavilo v seznamu omrežij."
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Za urejanje sporo�ila po meri:"
+#: C/account-irc.page:125(item/title)
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Znakovni nabor</gui>"
 
-#: 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 "V polju <gui>Shranjene prednastavljene</gui> izberite sporo�ilo stanja, ki ga želite uredi, in ga dvokliknite."
+#: C/account-irc.page:126(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."
+msgstr "To navede znakovno kodiranje, ki je obi�ajno uporabljano na temu omrežju. Znakovno kodiranje je dolo�en na�in notranjega zapisovanja znakov v ra�unalniku. Obstaja ve� znakovnih kodiranj. Za pravilen ogled sporo�il drugih uporabnikov morate uporabljati isto znakovno kodiranje kot oni."
 
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr "Vnesite novo sporo�ilo po meri in pritisnite <key>Enter</key> za njegovo spremembo."
+#: C/account-irc.page:135(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."
+msgstr "Privzeto <app>Empathy</app> uporablja UTF-8, priljubljeno znakovno kodiranje, ki lahko upravlja z ve�ino svetovnih jezikov. Drugo pogosto kodiranje za slovenš�ino in nekatere druge srednjeevropske jezike je ISO-8859-2."
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Za odstranitev sporo�ila po meri:"
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Strežniki</gui>"
 
-#: C/set-custom-status.page:118(p)
-msgid "From the <gui>Saved Presets</gui> box, select the status message you want to remove."
-msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporo�ilo stanja, ki ga želite odstraniti."
+#: C/account-irc.page:142(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."
+msgstr "Omrežje IRC ima lahko veliko strežnikov na katere se lahko povežete. Ko ste povezani na strežnik na dolo�enemu omrežju se lahko sporazumevate z vsemi uporabniki na vseh ostalih strežnikih na temu omrežju. Omrežju lahko dodate ali odstranite strežnike z uporabo gumbov <gui>Dodaj</gui> in <gui>Odstrani</gui>."
 
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Kliknite na gumb <gui>Odstrani</gui>."
+#: C/account-irc.page:147(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."
+msgstr "Ko je strežnik izbran za urejanje kliknite na <gui>Strežnik</gui> ali <gui>Vrata</gui>. Namesto tega lahko uporabite puš�ici levo in desno za žariš�enje na polje in pritisnite preslednico za za�etek urejanja."
 
-#: C/set-custom-status.page:131(p)
-msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr "Za dodajanje novega sporo�ila po meri iz odseka <gui>Dodajanje nove prednastavljene</gui>:"
+#: 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 "Izberite izbirno polje v stolpcu <gui>SSL</gui> za šifriranje vse komunikacije s strežnikom. Vedite da to ostalim uporabnikom na omrežju ne prepre�uje ogleda vnosov, ki ste jih napisali v javne klepetalnice."
 
-#: 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 "Kliknite na spustni seznam za izbiro stanja kateremu želite nastaviti sporo�ilo po meri. "
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Napredne možnosti za ra�une Jabber in Google Talk. "
 
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Kliknite na besedilno polje in vpišite novo sporo�ilo po meri."
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Podrobnosti ra�una Jabber"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "Kliknite na <gui>Dodaj</gui> za dodajanje novega sporo�ila k prednastavljenim."
+#: C/account-jabber.page:31(page/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\"/>."
+msgstr "Ve�ina ra�unov Jabber bo za povezavo zahtevala le ID prijave in geslo. Za nekatere ra�una na nekaterih vrstah omrežij boste morda morali vnesti dodatne podatke v odsek <gui>Napredno</gui>. Obi�ajno vam naprednih možnosti spodaj ne bo treba uporabljati. Za splošna navodila o dodajanju ra�una si oglejte <link xref=\"add-account\" />."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Ko ste kon�ali kliknite na <gui>Zapri</gui>."
+#: C/account-jabber.page:39(note/p)
+msgid "Google Talk is a type of Jabber account. These instructions hold for Google Talk accounts as well."
+msgstr "Google Talk je vrsta ra�una Jabber. Ta navodila veljajo tudi za ra�una Google Talk."
 
-#: 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 "Ko urejate ali dodajate novo sporo�ilo po meri, ne bo nastavljeno kot trenutno sporo�ilo stanja. Morali ga boste izbrati v oknu <gui>Seznam stikov</gui>."
+#: C/account-jabber.page:45(item/title)
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Zahtevano je Å¡ifriranje (TLS/SSL)</gui>"
 
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Pošljite sporo�ilo enemu od vaših stikov."
+#: C/account-jabber.page:46(item/title)
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>Prezri napake potrdil SSL</gui>"
 
-#: 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/account-jabber.page:47(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."
+msgstr "Kadar je mogo�e je sporazumevanje med <app>Empathy</app> in strežnikom Jabber šifrirana. V primeru da šifrirana komunikacija ni mogo�a, morda morda sporo�ila poslana nešifrirano. Izberite <gui>Zahtevano šifriranj</gui> za prepre�itev komunikacije <app>Empathy</app> s strežniki Jabber, ko šifriranje ni mogo�e."
 
-#: 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 "Pošiljanje sporo�ila nekomu"
+#: 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 "Nekateri strežniki Jabber lahko šifrirajo podatke z neveljavnimi potrdili ali s potrdili neznanih overiteljev potrdil. V primeru da strežniku na katerega se povezujete zaupate, izberite <gui>Prezri napake potrdil SSL</gui> za omogo�itev šifriranja sporazumevanja z neveljavnimi potrdili."
 
-#: 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 "V <gui>Seznamu stikov</gui> dvokliknite ime stika s katerim želite imeti pogovor."
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<b>Vir</b>"
 
-#: 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 "Odprlo se bo novo okno. Vpišite sporo�ilo v polje na dnu okna in pritisnite <key>Enter</key> za pošiljanje."
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prednost</gui>"
 
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Pošiljanje sporo�ila meta-stiku"
+#: C/account-jabber.page:61(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."
+msgstr "V primeru da je z vašim ra�uni hkrati povezanih ve� programov (na primer na lo�enih ra�unalnikih) lahko nastavite vir za edinstveno identifikacijo vsakega. Privzeto bo <app>Empathy</app> kot vir uporabil <input>Telepathy</input>."
 
-#: 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 "Izberite ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
+#: C/account-jabber.page:65(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."
+msgstr "Nastavite lahko prednost za navedbo kateri programi naj prejmejo dohodna sporo�ila od vaših stikov. Nova sporo�ila bodo poslana programu z najvišjo prednostjo."
 
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Pošljite datoteko s svojega ra�unalnika enemu od svojih stikov."
+#: C/account-jabber.page:70(item/title)
+msgid "<gui>Override server settings</gui>"
+msgstr "Kliknite <gui>Prepiši nastavitve strežnika</gui>."
 
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Pošiljanje datotek"
+#: 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 "<app>Empathy</app> bo uporabljal privzete nastavitve za povezovanje s strežnikom Jabber na osnovi vašega ID-ja prijave. Za nekatere strežnike Jabber boste morali ro�no vnesti nastavitve strežnika po meri. Te nastavitve bi vam moral dati vaš ponudnik Jabber."
 
-#: 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 "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Dodajanje, spreminjanje in brisanje ra�unov."
 
-#: 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 "Desno kliknite na stik, kateremu želite poslati datoteko in izberite <gui>Pošlji datoteko</gui>."
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Okno ra�unov"
 
-#: 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 "Kliknite na stik, kateremu želite poslati datoteko in izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Pošlji datoteko</gui></guiseq>."
+#: C/accounts-window.page:35(page/p)
+msgid "The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
+msgstr "Okno <gui>Ra�uni</gui> vam omogo�a dodajanje, spreminjanje in brisanje ra�unov."
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Izberite datoteko za pošiljanje in kliknite na <gui>Pošlji</gui>."
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Podrobnosti ra�una"
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Pojavilo se bo okno <gui>Prenosi datotek</gui>."
+#: 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 "Za ve�ino vrst ra�unov lahko enostavno vnesete ID prijave in geslo. Nekateri ra�uni ali vrste ra�unov morda zahtevajo dodatne podatke."
 
-#: 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 "Po�akajte da vaš stik sprejme prenos datotek ali kliknite <gui>Zaustavi</gui> za zaustavitev prenosa."
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Dodajanje novega ra�una v <app>Empathy</app>."
 
-#: C/send-file.page:72(p)
-msgid "Once the transfer is finished, it is possible to close the <gui>File Transfers</gui> window."
-msgstr "Ko je prenos kon�an, je mogo�e okno <gui>Prenosi datotek</gui> zapreti."
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Dodajanje novega ra�una"
 
-#: 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 "V primeru da imate v oknu ve� kon�anih prenosov, kliknite na <gui>Po�isti</gui> za spraznjene seznama. To bo datoteke le odstranilo s seznama in jih ne bo izbrisalo z vašega ra�unalnika."
+#: C/add-account.page:42(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\"/>."
+msgstr "Ra�une hipnega sporo�anja za sporazumevanje z vsemi svojimi stiki v <app>Empathy</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike ra�unov vam bodo ti koraki omogo�ili tudi ustvarjanje novega ra�una. Za ve� podrobnosti si oglejte <link xref=\"create-account\"/>."
 
-#: 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 "Pošiljanje datotek je mogo�e samo z uporabo naslednjih storitev: <em>Jabber</em>, <em>Google Talk</em> in <em>Ljudje v bližini</em>."
+#: 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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Uredi</gui><gui>Ra�uni</gui></guiseq> ali pritisnite <key>F4</key>."
 
-#: 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 "Za pošiljanje datotek morate biti povezani na medmrežje ali krajevno omrežje."
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Kliknite <gui style=\"button\">+</gui>."
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Razumevanje zmožnosti ljudje v bližini."
+#: C/add-account.page:58(item/p)
+msgid "From the <gui>Protocol</gui> drop-down list, select the type of account you wish to add."
+msgstr "Na spustnemu seznamu <gui>Protokol</gui> izberite vrsto ra�una, ki jo želite dodati."
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Kaj je \"Ljudje v bližini\"?"
+#: 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 "V primeru da še niste ustvarili novega ra�un, izberite <gui>Ustvari nov ra�un na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste ra�unov in morda ne bo delovala z nekaterimi ponudniki ra�unov. Za ve� podrobnosti si oglejte <link xref=\"create-account\"/>. "
 
-#: C/salut-protocol.page:37(p)
-#, fuzzy
-msgid "I'd like to see this played up a bit more."
-msgstr "?"
+#: 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 "Vnesite zahtevane podatke. Za ve�ino ra�unov boste potrebovali le ID prijave in geslo. Nekateri ra�uni morda zahtevajo dodatne podrobnosti. Za ve� podrobnosti si oglejte <link xref=\"accounts-window#details\"/>."
 
-#: 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 "Storitev ljudje v bližini je storitev sporo�anja brez strežnika: za uporabo se vam ni potrebno povezati in overiti s centralnim strežnikom."
+#: 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 "Kliknite <gui style=\"button\">Uveljavi</gui>."
 
-#: 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 "Ta vrsta sistema sporo�anja brez strežnika je omejena na krajevno omrežje in dejavna medmrežna povezava ni potrebna."
+#: C/add-account.page:81(note/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 "Za spremembo imena, ki identificira ra�un v oknu <gui>Ra�uni</gui>, izberite ra�un s seznama na levi ali kliknite na ime ali pritisnite preslednico. Uredite ime ra�una in pritisnite <key>Enter</key>, ko ste kon�ali."
 
-#: 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 "Ljudje, ki uporabljajo to storitev znotraj istega krajevnega omrežja, bodo samodejno odkriti in mogo�e jim bo poslati sporo�ila in datoteke kot z ostalimi storitvami. "
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Dodajanje nekoga na seznam stikov."
 
-#: C/salut-protocol.page:54(p)
-msgid "All the modern local area networks should be able to support this kind of service."
-msgstr "Vsa novejša krajevna omrežja bi morala podpirati to vrsto storitve."
+#: 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/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Popolnoma odstrani ra�un iz <app>Empathy</app>."
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Dodajanje nekoga na vaš seznam stikov"
 
-#: C/remove-account.page:34(title)
-msgid "Remove an account"
-msgstr "Odstranitev ra�una"
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Klepet</gui><gui>Dodaj stik</gui></guiseq>."
 
-#: 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 "V primeru da ra�una ne želite ve� uporabljati, lahko ra�un popolnoma odstranite iz <app>Empathy</app>. V primeru da želite v prihodnosti ra�un v <app>Empathy</app> ponovno uporabljati boste morali ponovno dodati podrobnosti svojega ra�una."
+#: C/add-contact.page:40(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."
+msgstr "Na spustnemu seznamu <gui>Ra�un</gui> izberite ra�un, ki ga želite uporabiti za povezovanje z vašim stikom. Vaš stik bo moral uporabiti isto storitev kot ra�un, ki ste ga izbrali."
 
-#: 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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Uredi</gui><gui>Ra�uni</gui></guiseq> ali pritisnite <key>F4</key>."
+#: C/add-contact.page:45(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."
+msgstr "V polju <gui>Dolo�ilo</gui> vnesite ID vašega stika, uporabniško ime, prikazano ime ali drugo primerno dolo�ilo za vrsto storitve."
 
-#: 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 "Na seznamu ra�unov na levi strani okna izberite ra�un, ki ga želite odstraniti."
+#: C/add-contact.page:49(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."
+msgstr "V polje <gui>Vzdevek</gui> vtipkajte ime vašega stika, kot naj se pojavi v vašemu seznamu stikov."
 
-#: C/remove-account.page:51(p)
-msgid "Click <gui style=\"button\">-</gui>."
-msgstr "Kliknite <gui style=\"button\">-</gui>."
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr "Za dodajanje osebe na vaš seznam stikov kliknite <gui>Dodaj</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 "Pojavilo se pogovorno okno, ki vas bo spraševalo za potrditev. Kliknite gumb <gui>Odstrani</gui> za odstranitev ra�una."
+#: C/add-contact.page:61(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."
+msgstr "Za dodajanje nove osebe na vaš seznam stikov morate biti povezani na medmrežje in na vaš ra�un."
 
-#: 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 "Tudi po odstraniti ra�una <app>Empathy</app> ne izbriše zgodovine vaših pogovorov za ta ra�un."
+#. 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 "external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
-msgstr "Diagnoza pogostih težav pri povezovanju s storitvijo takojšnjega sporo�anja."
+#: C/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Klic vaših stikov preko medmrežja."
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Težave s povezovanjem s storitvijo hipnega sporo�anja"
+#: C/audio-call.page:27(page/title)
+msgid "Start an audio conversation"
+msgstr "Za�enjanje zvo�nega pogovora"
 
-#. 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-call.page:29(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."
+msgstr "Svoje stike lahko pokli�ete in imate z njimi zvo�ni pogovor. Ta zmožnost deluje le z dolo�enimi vrstami ra�unov in pod pogojem da ima druga oseba program, ki podpira zvo�ne klice."
 
-#: C/prob-conn-neterror.page:7(desc)
-msgid "An error message which says “<gui>Network error</gui>� appears in the main window."
-msgstr "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi  “<gui>Network error</gui>�."
+#: C/audio-call.page:34(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>."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati in izberite <gui style=\"menuitem\">Zvo�ni klic</gui>."
 
-#: C/prob-conn-neterror.page:34(title)
-msgid "I get a message that says “Network error�"
-msgstr "Dobim sporo�ilo, ki pravi “Napaka omrežja�"
+#: C/audio-call.page:42(item/p)
+#: C/video-call.page:44(item/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 "Odprlo se bo novo okno. Ko je povezava vzpostavljena boste na dnu okna videli <gui>Povezano</gui> skupaj s celotnim �asom pogovora."
 
-#: C/prob-conn-neterror.page:37(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: 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 "Za kon�anje pogovora izberite <guiseq><gui style=\"menu\">Klic</gui><gui style=\"menuitem\">Odloži</gui></guiseq>."
 
-#: 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 vam ne dovoli ustvarjanje ra�una IRC brez veljavnega vzdevka. Povezava vodi�a je bila odstranjena. Odstrani besedilo."
+#: 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>."
+msgstr "Za spremembo zvo�nega pogovora v video pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Vklopi video</gui></guiseq>."
 
-#: C/prob-conn-neterror.page:42(p)
-msgid "This kind of error happens when <app>Empathy</app> cannot communicate with the instant messaging service for some reason."
-msgstr "Ta vrsta napake se zgodi, ko <app>Empathy</app> zaradi nekega vzroka ne more komunicirati s storitvijo hipnega sporo�anja. "
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Za�etek zvo�nega pogovora z meta-stikom"
 
-#: C/prob-conn-neterror.page:46(p)
-msgid "Also, this kind of error happens when you try to use an IRC account without setting a nickname."
-msgstr "Ta vrsta napake se zgodi, ko poskušate uporabiti ra�un IRC brez nastavitve vzdevka."
+#: 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 "V oknu <gui>Seznam stikov</gui> desno kliknite na meta-stik."
 
-#: 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 "Prepri�ajte se, da ste povezani na medmrežje ali na krajevno omrežje."
+#: C/audio-call.page:71(item/p)
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui>Zvo�ni klic</gui>."
 
-#: 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 "V sporo�ilu napake kliknite na ikono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">uredi</media>."
+#: C/audio-call.page:78(note/p)
+#: C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/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 "Če želite videti ali je stik <em>meta-stik</em>, premaknite miško na stik v oknu <gui>Seznam stikov</gui> in se nad njim za trenutek zaustavite: pojavilo se bo majhno sporo�ilo, ki prikazuje število stikov, ki tvorijo meta-stik."
 
-#: 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 odseku <gui>Napredno</gui> preverite, da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletiš�u storitve sporo�anja."
+#. 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 "external ref='figures/audio-input-microphone.png' md5='8d89026b66a263a3bc5b1f0665948567'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='8d89026b66a263a3bc5b1f0665948567'"
 
-#: 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 "Izklopite ra�un in ga ponovno vklopite za poskus ponovne povezave s storitvijo."
+#: C/audio-video.page:8(info/desc)
+msgid "Information on when it is possible to have an audio or video conversation."
+msgstr "Podatki kdaj je mogo�e imeti zvo�ni ali video pogovor."
 
-#: C/prob-conn-neterror.page:87(title)
-msgid "Proxy support"
-msgstr "Podpora posredniških strežnikov"
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Podpora za zvok in video"
 
-#: C/prob-conn-neterror.page:88(p)
-msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr "Trenutno <app>Empathy</app> ni mogo�e nastaviti za delo s posredovalnim strežnikom."
+#: 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 "Zvo�ne in video pogovor imate lahko le s stiki, ki uporabljajo program s podporo te zmožnosti. V primeru da vaši stiki podpirajo zvo�ne ali video pogovore lahko vidite naslednje ikone poleg njihovih imen na seznamu stikov:"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "“Ime v uporabi�"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Ikona"
 
-#: C/prob-conn-name.page:10(desc)
-msgid "An error message which says “<gui>Name in use</gui>� appears in the main window."
-msgstr "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi  “<gui>Ime v uporabi</gui>�."
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Opis"
 
-#: C/prob-conn-name.page:33(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Dobim sporo�ilo, ki pravi “Ime v uporabi� "
+#: C/audio-video.page:57(td/p)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\"> Icon for audio conversation </media>"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-microphone.png\"> Ikona za zvo�ni pogovor </media>"
 
-#: 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 "Ta vrsta napak se zgodi, ko se poskusite povezati s svojim ra�unom IRC in uporabljate vzdevek, ki ga na istemu omrežju že uporablja nekdo drug. "
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "Stik lahko ima zvo�ni pogovor."
 
-#: C/prob-conn-name.page:51(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "V besedilno polje <gui>Vzdevek</gui> vpišite nov vzdevek."
+#: C/audio-video.page:69(td/p)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> Icon for video conversation </media>"
+msgstr "V sporo�ilu napake kliknite na ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">Ikona za video pogovor</media>."
 
-#: 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 "V primeru da ste ta vzdevek ustvarili v omrežju, ki ga uporabljate, nastavite geslo za ta vzdevek. Za ve� podrobnosti si oglejte  <link xref=\"irc-nick-password\"/>."
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "Stik lahko ima video pogovor."
 
-#: C/prob-conn-auth.page:8(desc)
-msgid "An error message which says “<gui>Authentication failed</gui>� appears in the main window."
-msgstr "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi “<gui>Overitev je spodletela</gui>�."
+#: C/audio-video.page:83(note/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."
+msgstr "Za zvo�ni pogovor morate imeti zvo�no kartico, ki jo vaš operacijski sistem podpira, in delujo�i mikrofon. "
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "Dobil sporo�ilo, ki pravi “Overitev je spodletela�"
+#: C/audio-video.page:87(note/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."
+msgstr "Za video pogovor morate imeti spletno kamero, ki jo vaš operacijski sistem podpira, in delujo�i mikrofon."
 
-#: 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 "Ta vrsta napake se zgodi, ko vam storitev takojšnjega sporo�anja ne dovoli povezave ker zaradi nekega vzroka ne prepozna vašega uporabniškega imena ali gesla."
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Podprte vrste ra�unov"
 
-#: 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 "Prepri�ajte se, da ste ustvarili ra�un za storitev s katero se želite povezati. V primeru da nimate ra�una, vam ve�ina storitev ne bo dovolila povezave."
+#: C/audio-video.page:97(section/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 "Video in zvo�ne pogovore imate lahko le z uporabo ra�unov na dolo�enih podprtih storitvah. Naslednja razpredelnica našteva ali sta zvok in video podprta za vsako vrsto ra�una."
 
-#: 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 "Ponovno vpišite svoje uporabniško ime in geslo ter se prepri�ajte da sta pravilna."
+#: 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 "Vrste ra�unov zagotavljajo vstavki. Vaš sistem morda nima na voljo vseh slede�ih vrst, ali morda vsebuje vrste, ki tukaj niso naštete. Posodobljeni vstavki lahko omogo�ijo zvo�ni ali video klepet na vrstah ra�unov, ki so tukaj naštete kot nepodprte."
 
-#: 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 "Odstranite izbiro <gui>Omogo�eno</gui> in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Storitev"
 
-#: 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 "Ra�un hipnega sporo�anja, ki ga želite uporabiti ni omogo�en na seznamu ra�unov."
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Zvok"
 
-#: C/prob-conn-acctdisabled.page:34(title)
-msgid "My account is not enabled"
-msgstr "Moj ra�un ni omogo�en"
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Video"
 
-#: 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 "V primeru da ra�un hipnega sporo�anja, ki ga želite uporabiti, v spustnemu seznamu ra�unov ob poskusu za�etka novega pogovora ali pridružitve sobe ni omogo�en, so morda podrobnosti vašega ra�una nepravilne. "
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: 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 "Izberite <guiseq><gui>Uredi</gui><gui>Ra�uni</gui></guiseq> in izberite ra�un, ki ne deluje."
+#: 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 "Ne"
 
-#: C/prob-conn-acctdisabled.page:66(p)
-msgid "Check that the account is switched on."
-msgstr "Preverite, da je ra�un vklopljen."
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook klepet"
 
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Brskanje ali iskanje po preteklih pogovorih."
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prev-conv.page:36(title)
-msgid "View previous conversations"
-msgstr "Ogled preteklih pogovorov"
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: 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> samodejno shrani vse vaše besedilne pogovore z vašimi stiki. Lahko <link xref=\"#search\">iš�ete po vseh vaših predhodnih pogovorih</link> ali <link xref=\"#browse\">brskate predhodne pogovore</link> po stiku in datumu."
+#: 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 "Da"
 
-#: 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 "Za ogled in iskanje vaših predhodnih pogovorov vam ni treba biti povezan na medmrežje."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prev-conv.page:53(title)
-msgid "Search previous conversations"
-msgstr "Iskanje predhodnih pogovorov"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prev-conv.page:55(p)
-msgid "You can perform a full-text search through all of your previous conversations."
-msgstr "Izvedete lahko iskanje celega besedila skozi vse vaše predhodne pogovore."
+#: C/audio-video.page:165(td/p)
+#: C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: 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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Pretekli pogovori</gui></guiseq>. Namesto tega lahko pritisnete <key>F3</key>."
+#: C/audio-video.page:170(td/p)
+#: C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: 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 "Izberite ra�un s spustnega seznama na vrhu. Seznam vseh stikov in klepetalnic za ta ra�un bo prikazan spodaj."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/prev-conv.page:67(p)
-msgid "Type the text you want to search for in the <gui>Search</gui> text field."
-msgstr "Vnesite besedilo, ki ga želite najti, v besedilno polje <gui>Iskanje</gui>."
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: 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 "Katerikoli pogovori, ki se skladajo z vašimi iskalnimi pogoji bodo prikazani v seznamu pod iskalnim poljem. Privzeto so pogovori razvrš�eni po datumu."
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prev-conv.page:80(title)
-msgid "Browse previous conversations"
-msgstr "Brskaj predhodne pogovore"
+#: C/audio-video.page:190(td/p)
+#: C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Ljudje v bližini"
 
-#: C/prev-conv.page:82(p)
-msgid "You can browse your previous conversations with your contacts or in chat rooms by date."
-msgstr "Svoje predhodne pogovore s svojimi stiki ali klepetalnicami lahko brskate po datumu."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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 "Izberite ra�un s spustnega seznama zgoraj levo. Seznam vseh stikov in klepetalnic za ta ra�un bo prikazan spodaj."
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: 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 "Izberite stik ali klepetalnico za ogled svojih predhodnih pogovorov. Privzeto bodo prikazani najbolj nedavni stiki."
+#: C/audio-video.page:205(td/p)
+#: C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: 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 "Svoje pogovore lahko brskate po datumu. Dnevi ob katerih ste imeli pogovor z izbranim stikom bodo prikazni krepko. Kliknite na datum za izbiro. Kliknite puš�ice poleg meseca in leta za brskanje zgodnejših datumov."
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: 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 "Besedilo v prikazanemu pogovoru lahko iš�ete s pisanjem v iskalno polje na vrhu. Skladajo�e besedilo bo poudarjeno."
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: 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 "Predhodne pogovore z enim od svojih stikov si lahko hitro ogledate v oknu <gui>Seznam stikov</gui>. Desno kliknite na stik in izberite <gui>Ogled predhodnih pogovorov</gui>. Odprlo se bo okno <gui>Predhodni pogovori</gui> s predhodno izbranim stikom."
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Spremenite svoje stanje za oglaševanje vaše razpoložljivosti vašim stikom."
 
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Združite in lo�ite razli�ne stike v enega."
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Sprememba stanja"
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Združevanje in lo�evanje stikov"
+#: C/change-status.page:41(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."
+msgstr "Nastavite lahko svoje stanje za nakaz vaše razpoložljivosti vašim stikov. <app>Empathy</app> vam omogo�a izbiro s seznama dolo�enih stanj."
 
-#: 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 "Če ima eden ali ve� vaših stikov ve� ra�unov z razli�nimi storitvami sporo�anja, jih lahko združite v enega."
+#: C/change-status.page:46(item/p)
+msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "Kliknite na spustni seznam na vrhu okna <gui>Seznam stikov</gui>."
 
-#: 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 "Nastali stik se imenuje <em>meta-stik</em>: stik sestavljen iz ve� razli�nih stikov."
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Izberite stanje s seznama"
 
-#: C/link-contacts.page:34(p)
-msgid "If you have a Jane Smith contact that is using three different messaging services like:"
-msgstr "V primeru da imate Janeza Novaka, ki uporablja tri razli�ne storitve sporo�anja kot:"
+#: C/change-status.page:57(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."
+msgstr "Oglejte si <link xref=\"status-icons\"/> za seznam vgrajenih stanj in kaj pomenijo.  Lahko tudi <link xref=\"set-custom-message\">dodate sporo�ila stanja po meri</link> za ve� podrobnosti o vaši razpoložljivosti svojim stikom."
 
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "janez@facebook"
+#: C/change-status.page:63(note/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."
+msgstr "V primeru da svojega ra�unalnika nekaj �asa ne uporabljate, ali �e je ohranjevalnik zaslona vklopljen bo stanje samodejno nastavljeno na Odsoten."
 
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "janez.novak@gmail"
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Ustvarjanje ra�una z eno od podprtih storitev sporo�anja."
 
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "janez_novak@hotmail"
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Ustvarjanje novega ra�una"
 
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "Te stike lahko združite v en stik Janez Novak."
+#: C/create-account.page:36(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>."
+msgstr "Ve�ina vrst ra�unov pred povezovanjem s programom hipnega sporo�anja kot je <app>Empathy</app> zahteva ustvarjanje ra�una s ponudnikom ra�una. Za nekatere ponudnike ra�unov je mogo�e za ustvarjanje novega ra�una uporabiti <app>Empathy</app> z uporabo enakih korakov kot za  <link xref=\"add-account\">dodajanje ra�una</link>."
 
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Združevanje stikov"
+#: C/create-account.page:42(page/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 "Ta stran zagotavlja podatke o ustvarjanju novih ra�unov za razli�ne vrste ra�unov. Vaš ponudnik ra�una vam bi moral dati ID prijave in geslo ter morebitne dodatne podatke, ki jih potrebujete za povezavo z <app>Empathy</app>."
 
-#: 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...</gui>."
-msgstr "V oknu <gui>Seznam stikov</gui> desno kliknite na enega od stikov, ki ima razli�ne ra�una in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: 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 "V levem pladnju v oknu <gui>Poveži stike</gui> izberite stike, ki jih želite združiti."
+#: C/create-account.page:48(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."
+msgstr "Facebook je eno od najbolj uporabljanih družabnih omrežij. Uporabnikom dovoljuje ustvarjanje njihovega lastnega profila in komunikacijo s prijatelji."
 
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
+#: C/create-account.page:52(section/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 "Za uporabo Facebooka za komunikacijo s prijatelji boste morali ustvariti nov ra�un na spletni strani: <link href=\"http://www.facebook.com\">www.facebook.com</link>."
 
-#: 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 "Ko je bil meta-stik ustvarjen, bo za pogovarjanje uporabljen stik z najpogostejšo povezanostjo."
+#: C/create-account.page:62(section/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 je odprt sistem takojšnjega sporo�anja. Tako kot elektronska pošta, vam Jabber omogo�a izbiro vašega ponudnika ra�una in sporo�anje z vsemi drugimi uporabniki Jabber ne glede na njihovega ponudnika ra�una. "
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Lo�evanje stikov"
+#: C/create-account.page:66(section/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 "S ponudnikom Jabber boste morali ustvariti nov ra�un. Obstaja veliko brezpla�nih podudnikov; en priljubljen ponudnik je <link href=\"http://register.jabber.org/\">Jabber.org</link>."
 
-#: 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 "V <gui>Seznamu stikov</gui> desno kliknite na stik za lo�evanje in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
+#: C/create-account.page:71(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."
+msgstr "V primeru da uporabljate GMail ali Google Talk že imate ra�un Jabber. Google Talk je storitev Jabber. Za povezavo v <app>Empathy</app> enostavno uporabite svoj GMail naslov in geslo.  "
 
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Kliknite <gui style=\"button\">Razveži</gui>."
+#: C/create-account.page:80(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."
+msgstr "Za uporabo te zmožnosti vam ni treba ustvariti ra�una s ponudnikom storitve. Ta storitev deluje kadarkoli ste povezani na krajevno omrežje kot je brezži�na vro�a to�ka. Samodejno najde ostale uporabnike na omrežju, ki tudi uporabljajo to storitev."
 
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Pravni podatki."
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Za ve� podrobnosti si oglejte <link xref=\"salut-protocol\"/>."
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Licenca"
+#: C/create-account.page:91(section/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 je odprt sistem, ki uporabnikom omogo�a zvo�ne in video pogovore preko medmrežja. S ponudnikom SIP morate ustvariti ra�un. Sporazumevate se lahko z vsemi drugimi uporabniki SIP, ne glede na to katerega ponudnika SIP uporabljajo."
 
-#: C/license.page:12(p)
-msgid "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 Unported license."
-msgstr "Ta delo je distribuirano pod CreativeCommons Attribution-Share Alike 3.0 Unported license."
+#: C/create-account.page:97(note/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 "Zaradi tehni�nih razlik brezpla�na storitev <link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> ne deluje z <app>Empathy</app>."
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Prosto lahko:"
+#: C/create-account.page:102(section/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 "Nekateri podnudniki SIP vam z vašega ra�unalnika omogo�ajo klic na obi�ajne telefone. V splošnem se morate za uporabo te zmožnosti naro�i na pla�ljivo storitev. "
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "souporabljate"
+#: C/create-account.page:109(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."
+msgstr "Za uporabo IRC-a vam ni treba ustvariti ra�una. Čeprav ob dodajanju ra�una IRC v <app>Empathy</app> navedete vzdevek, je vzdevek vzpostavljen ob vsaki povezavi. V primeru da vzdevek uporablja drug uporabnik, boste morali izbrati nov vzdevek. "
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Za kopiranje, distribuiranje in prenašanje dela."
+#: C/create-account.page:114(section/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."
+msgstr "Nekatera omrežja IRC uporabljajo storitev z imenom NickServ, ki uporabnikom omogo�a zaš�ito njihovih vzdevkov. Za ve� podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Predelava"
+#: C/create-account.page:117(section/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."
+msgstr "Nekateri strežniki IRC so zaš�iteni z geslom. Za povezavo s temi strežniki boste morali poznati geslo. V splošnem so to zasebna omrežja IRC."
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Prilagajanje dela"
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Lastniške storitve"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "Pod naslednjimi pogoji:"
+#: C/create-account.page:124(section/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."
+msgstr "Razli�na podjetja in organizacije so razvile veliko lastniških storitev hipnega sporo�anja. <app>Empathy</app> vam omogo�a povezavo z obstoje�im ra�unom za ve�ino priljubljenih storitev. Za ustvarjanje novega ra�una z eno od teh storitev boste morali obiskati spletiš�e storitve in se strinjati s pogoji uporabe."
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Priznanje avtorstva"
+#: 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: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 "Delo morate prilastiti na na�in, ki ga je navedel avtor ali dajalec licence (toda ne na kakršenkoli na�in, ki predlaga spodbudo vas ali vaše uporabe dela)."
+#: 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:46(em)
-msgid "Share Alike"
-msgstr "Deljenje pod istimi pogoji"
+#: 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: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 "V primeru da spremenite, preoblikujete ali nadgradite to delo, lahko nastalo delo distribuirate le pod enako, podobno ali združljivo licenco."
+#: 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: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 "Za polno besedilo licence si oglejte <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">spletiš�e CreativeCommons</link>, ali preberite polno besedilo<link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Prepre�itev samodejnega prijavljanja <app>Empathy</app> v ra�un."
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Za�etek pogovora s stikom IRC."
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Onemogo�itev ra�una"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Klepet z nekom na IRC-u"
+#: C/disable-account.page:42(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."
+msgstr "Za prepre�itev prijave v <app>Empaty</app> brez odstranitve ra�una lahko ra�un onemogo�ite. Morda želite ra�un onemogo�iti in ponovno omogo�iti v primeru da želite biti v ra�un prijavljeni le ob dolo�enih �asih, toda želite <app>Empathy</app> še vedno uporabiti za druge ra�une. "
 
-#: 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 "Z drugimi uporabniki IRC imate lahko zasebne pogovore zunaj javnih klepetalnic IRC. Za za�etek pogovora z drugim uporabnikom IRC:"
+#: C/disable-account.page:53(item/p)
+msgid "Select the account you wish to disable from the accounts list on the left side of the window."
+msgstr "Izberite ra�un, ki ga želite onemogo�iti, s seznama ra�unov na levi strani okna."
 
-#: 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 "Na seznamu stikov klepetalnice IRC dvokliknite ime uporabnika s katerim želite klepetati. Namesto tega lahko desno kliknete na ima uporabnika in izberete <gui>Klepet</gui>."
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Na desni strani okna ga izklopite."
 
-#: 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 "Seznam stikov sobe IRC ni enak kot seznam stikov <app>Empathy</app>. Vsebuje seznam uporabnikov v klepetalnicah IRC, ki ste se jim pridružili. Razli�ne sobe imajo lahko razli�ne sezname stikov."
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Za ponovno omogo�itev ra�una ga vklopite."
 
-#: 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 "Seznam stikov sobe IRC je obi�ajno na desni strani okna sobe IRC. V primeru da ga ne vidite izberite <guiseq><gui>Pogovor</gui><gui>Pokaži seznam stikov</gui></guiseq>."
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Nastavite, pridružite se in upravljajte priljubljene sobe."
 
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "<app>Empathy</app> trenutno ne podpira pošiljanja datotek preko IRC-a."
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Priljubljene sobe"
 
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Pošiljanje datotek preko IRC-a"
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Nastavi sobo kot priljubljeno"
 
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Trenutno preko IRC-a ni mogo�e pošiljati datotek."
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Pridružite se sobi."
 
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Zaš�itite vaš vzdevek in prepre�ite da bi ga uporabljali drugi uporabniki IRC."
+#: C/favorite-rooms.page:40(item/p)
+msgid "See <link xref=\"irc-join-room\"/> for more information on how to join an IRC room."
+msgstr "Za ve� podrobnosti kako se pridružiti sobi IRC si oglejte <link xref=\"irc-join-room\"/>. "
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Uporaba gesla vzdevka na IRC-u"
+#: C/favorite-rooms.page:46(item/p)
+msgid "See <link xref=\"group-conversations\"/> for more information on how to start or join a group conversation."
+msgstr "Za ve� podrobnosti kako za�eti ali se pridružiti skupinskemu pogovoru si oglejte <link xref=\"group-conversations\"/>."
 
-#: 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 "Na nekaterih omrežjih IRC lahko ustvarite svoj vzdevek s storitvijo z imenom NickServ. S pošiljanjem posebnih sporo�il NickServ lahko nastavite svojo geslo in se identificirate. Nekatere sobe klepeta IRC vam morda ne dovolijo pridružitve brez vpisanega vzdevka. "
+#: C/favorite-rooms.page:54(item/p)
+msgid "From the conversation window, choose <guiseq><gui>Conversation</gui><gui>Favorite Chat Room</gui></guiseq>."
+msgstr "V oknu pogovora izberite <guiseq><gui>Pogovor</gui><gui>Priljubljena klepetalnica</gui></guiseq>."
 
-#: 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> trenutno ne podpira ustvarjanja vzdevkov. Nekatera omrežja IRC bodo NickServ samodejno posredovala <em>geslo strežnika</em>. Na teh omrežjih lahko uporabite geslo IRC v <app>Empathy</app> za identifikacijo sebe NickServ. Priljubljeno omrežje FreeNode ima to zmožnost."
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Pridruži se priljubljenim sobam"
 
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Za nastavitev gesla strežnika IRC:"
+#: 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 "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
 
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "Izberite ra�un IRC s seznama na levi strani pogovornega okna."
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Pritisnite <key>F5</key>."
 
-#: C/irc-nick-password.page:57(p)
-msgid "In the <gui>Password</gui> field, type the password you used to register your nikcname."
-msgstr "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za ustvarjanje svojega vzdevka."
+#: C/favorite-rooms.page:76(item/p)
+msgid "Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all your favorite rooms."
+msgstr "Izberite <guiseq><gui>Soba</gui><gui>Pridruži se priljubljenim</gui></guiseq>, za pridružitev vsem vašim priljubljenim sobam."
 
-#: 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 "Kliknite <gui style=\"button\">Uveljavi</gui>."
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Izberite <gui>Soba</gui> in izberite sobo, ki se ji želite pridružiti."
 
-#: 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 "Ta navodila vam dovolijo uporabo z geslom zaš�itenega vzdevka na dolo�enih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogo�e ustvariti vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
+#: 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 "Za pridružitev priljubljeni sobi morate biti povezani z medmrežjem in z vašim ra�unom."
 
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Kako uporabiti IRC z <app>Empathy</app>."
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Upravljanje s priljubljenimi sobami"
 
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Klepet IRC"
+#: C/favorite-rooms.page:101(item/p)
+msgid "From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Upravljaj priljubljene</gui></guiseq>."
 
-#: 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 "Za uporabo IRC-a v <app>Empathy</app> morate imeti nameš�en paket <sys>telepathy-idle</sys>."
+#: C/favorite-rooms.page:107(item/p)
+msgid "From the <gui>Account</gui> drop-down list, select the account you want to manage the favorite rooms of."
+msgstr "V spustnemu seznamu <gui>Ra�un</gui> izberite ra�un, katerega priljubljene sobe želite upravljati."
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "Namesite telepathy-idle"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Izberite <gui>Vse</gui> za ogled vseh svojih priljubljenih sob."
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Pogovori in klepetalnice IRC"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Izberite priljubljeno sobo, ki jo želite upravljati:"
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Klepetalnice in pogovori"
+#: C/favorite-rooms.page:121(item/p)
+msgid "Select the <gui>Auto-Connect</gui> check-box in order to automatically join that room when you connect to your account."
+msgstr "Izberite izbirno polje <gui>Samodejna povezava</gui> za samodejno povezovanje s to sobo, ko se povežete s svojim ra�unom."
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Pogoste težave IRC"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Za odstranitev sobe iz svojih priljubljenih kliknite na <gui>Odstrani</gui>."
 
-#: C/irc-manage.page:58(title)
-#: C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Pogoste težave"
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Ko ste kon�ali, kliknite <gui>Zapri</gui>."
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Pridružitev kanalu IRC"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Uporabite in razumite geolego v <app>Empathy</app>."
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Pridružitev klepetalnici IRC"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Geografska lega"
 
-#: 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 "Pridružite se lahko klepetalnicam IRC (poznane so tudi kot kanali IRC) na kateremukoli omrežju IRC. Za povezavo z omrežjem IRC si oglejte <link xref=\"add-account\"/> in <link xref=\"account-irc\"/>."
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Geo-lega"
 
-#: 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 "V okno <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Pridruži se</gui></guiseq>."
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Popravi pogoste napake"
 
-#: 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 "V spustnemu seznamu <gui>Ra�un</gui> izberite ra�un IRC, ki ustreza omrežju, ki ga želite uporabiti."
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> ne objavi mojega geografskega položaja."
 
-#: 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 "V besedilno polje <gui>Soba</gui> vnesite ime kanala, ki se mu želite pridružiti. Imena kanalov IRC se za�nejo z znakom (<sys>#</sys>)."
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Geografska lega ni objavljena"
 
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Kliknite <gui>Pridruži se</gui> za vstop v sobo."
+#: C/geolocation-not-showing.page:34(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."
+msgstr "V primeru da vaši stiki ne morejo videti vašega položaj, <app>Empathy</app> morda ne more odkriti vašega geografskega položaja z dobro natan�nostjo. "
 
-#: C/irc-join-room.page:64(p)
-msgid "To join multiple rooms, you need to repeat the steps above for each room."
-msgstr "Za pridružitev ve� sobam boste morali ponoviti korake zgoraj za vsako sobo."
+#: C/geolocation-not-showing.page:38(page/p)
+msgid "In this case, your position will not be published, but you are still able to see the location of your contacts."
+msgstr "V temu primeru vaš položaj ne bo objavljen, toda še vedno boste lahko videli položaje vaših stikov."
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Vstop v z geslom zaš�itene klepetalnice IRC."
+#: C/geolocation-not-showing.page:42(page/p)
+msgid "If you want to publish your geographical position, you can try to use an external device such as a GPS."
+msgstr "V primeru da želite objaviti vaš geografski položaj, lahko poskusite z uporabo zunanje naprave kot je GPS."
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Pridružitev zaš�iteni klepetalnici IRC"
+#: C/geolocation-not-showing.page:48(note/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 "Za objavo svojega geografskega položaja, mora vaš strežnik Jabber podpirati Osebni protokol dogodkov (PEP). Seznam <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">strežnikov s podporo PEP</link> je vdrževan na spletu. Google Talk trenutno te zmožnosti ne podpira."
 
-#: 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 "Na nekaterih omrežjih IRC so zasebne sobe IRC morda zaš�itene z geslom. Če geslo poznate, uporabite naslednje korake za pridružitev:"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Kateri podatki so poslani in komu."
 
-#: 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\">Pridružite se sobi</link> kot obi�ajno."
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Zasebnost Geo-lege"
 
-#: 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 vas bo pozval za geslo. Vpišite geslo klepetalnice IRC in kliknite na <gui style=\"button\">Pridruži se</gui>."
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Kateri podatki so poslani"
 
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "Podprti ukazi IRC"
+#: C/geolocation-privacy.page:36(section/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 "Mogo�e je poslati: državo, regijo, krajevnost, podro�je, ulico, zgradbo, nadstropje, sobo, poštno številko, zemljepisno širino in dolžino, nadmorsko višino, hitrost in smer."
 
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Podprti ukazi IRC"
+#: C/geolocation-privacy.page:40(section/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 "Natan�nost in kakovost podatkov o vašemu geografskemu položaju je odvisna od programov infrastrukture uporabljene za odkritje vašega položaja."
 
-#: 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 "Za ogled seznama podprtih ukazov IRC v klepetalnico vpišite <input>/help</input> in pritisnite <key>Enter</key>."
+#: 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 "Druga�ne vrste omrežij imajo morda razli�ne vrste natan�nosti in lahko pošljejo razli�ne podatke. Uporaba zunanjih naprav kot sta GPS in mobilni telefon bo pove�alo natan�nost poslanih podatkov."
 
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "Vsi razpoložljivi ukazi imajo kratek opis njihove uporabe. "
+#: C/geolocation-privacy.page:49(section/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 "Ko je omogo�en na�in zasebnosti, ne bo poslano ni� bolj natan�no kot vaše mesto, tudi �e uporabljate zunanjo napravo."
 
-#. 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/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Kdo lahko vidi poslane podatke"
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Uvod v <app>Empathy</app> hipni sporo�evalnik."
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Vaš geografski položaj lahko vidijo le vaši stiki."
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Uvod"
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Kaj je na�in zasebnosti"
 
-#: C/introduction.page:23(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."
-msgstr "<app>Empathy</app> je program hipnega sporo�anja za namizje GNOME. Podpira besedilno sporo�anje, zvo�ne in video klice, prenose datotek in najbolj uporabljene sisteme za sporo�anje kot sta MSN in Google Talk."
+#: C/geolocation-privacy.page:64(section/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 "Na�in zasebnosti je privzeto omogo�en na�in zmanjšane natan�nosti, ki bo zmanjšal natan�nost geografskega položaja poslanega vašim stikom."
 
-#: C/introduction.page:28(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."
-msgstr "<app>Empathy</app> vklju�uje zmožnosti, ki vam pomagajo sodelovati pri delu in zmožnosti, ki vam omogo�ajo vzdrževanje stikov s svojimi prijatelji."
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Pregled zasebnosti"
 
-#: C/introduction.page:32(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."
-msgstr "Z <app>Empathy</app> lahko vse pogovore združite v eno okno, ali imate ve� oken za razli�ne vrste pogovorov; enostavno iš�ete skozi svoje predhodne pogovore in date svoje namizje v souporabo s samo dvema klikoma."
+#: C/geolocation-privacy.page:72(section/p)
+msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr "Pregled razli�nih nastavitev zasebnosti geo-lege v <app>Empathy</app>. "
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Okno <gui>Seznam stikov</gui>"
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "Geolega privzeto ni omogo�ena."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Glavno okno <app>Empathy</app>"
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "Na�in zasebnosti je privzeto omogo�en."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Glavno okno <app>Empathy</app>."
+#: C/geolocation-privacy.page:87(item/p)
+msgid "Privacy mode prevails even when using external and more precise devices."
+msgstr "Na�in zasebnosti prevlada celo pri uporabi zunanjih in bolj natan�nih naprav."
 
-#. 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 "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Vaš položaj lahko vidijo le vaši stiki."
 
-#: C/index.page:7(title)
-#: C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Empathy hipni sporo�ilnik"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Storitve, ki podpirajo geo-lego in združljivost."
 
-#: C/index.page:27(title)
-msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger"
-msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\">Logotip hipnega sporo�ilnika Empathy</media> Empathy hipni sporo�ilnik"
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Podprte storitve"
 
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Upravljanje z ra�uni"
+#: C/geolocation-supported.page:33(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."
+msgstr "Zmožnost geo-lege je trenutno združljiva le s storitvijo Jabber. Za uporabo zmožnosti morate imeti vi in vaš stik ra�un Jabber."
 
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Upravljanje stikov"
+#: C/geolocation-supported.page:39(note/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 "Zahtevano je, da strežnik, ki ga uporabljate, podpira zmožnost geo-lege. Podpira jo ve�ina strežnikov Jabber. Za ve� podrobnosti si oglejte si dokumentacijo na spletiš�u vaše storitve."
 
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Besedilni pogovori"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Združljivost"
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Zvo�ni in video pogovori"
+#: 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 "Zmožnost geo-lege <app>Empathy</app> ni združljiva z drugimi storitvami geografskih položajev kot so <em>Google Latitude</em>, <em>Yahoo Fire Eagle</em> ali <em>Brightkite</em>."
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Napredna dejanja"
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Kako omogo�iti in onemogo�iti geo-lego v <app>Empathy</app>."
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Uvozite ra�un iz drugega programa hipnega sporo�anja."
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Omogo�i/onemogo�i geo-lego"
 
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>."
 
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Izberite zavihek <gui>Mesto</gui>."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Uvoz obstoje�ega ra�una"
+#: C/geolocation-turn.page:47(item/p)
+msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr "Za omogo�enje geo-lege izberite <gui>Objavi položaj mojim stikom</gui> za objavo geo-lege."
 
-#: C/import-account.page:44(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 "Ob prvem zagonu <app>Empathy</app>, vam bo ponudil uvoz ra�unov iz drugih programov hipnega sporo�anja. Trenutno je edini podprti program <app>Pidgin</app>."
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Za onemogo�enje geo-lege odstranite njeno izbiro."
 
-#: C/import-account.page:50(p)
-msgid "Run <app>Empathy</app> for the first time. An assistant will offer you a number of options to create new accounts."
-msgstr "Prvi� poženite <app>Empathy</app>. Pomo�nik vam bo ponudil ve� možnosti za ustvarjanje novih ra�unov."
+#: C/geolocation-turn.page:55(item/p)
+msgid "To increase the accuracy of your position, deselect <gui>Reduce location accuracy</gui>."
+msgstr "Za pove�anje natan�nosti vašega položaja odstranite izbiro <gui>Zmanjšaj natan�nost položaja</gui>. "
 
-#: C/import-account.page:54(p)
-msgid "Select <gui>Yes, import my account details from</gui> and click <gui>Forward</gui>."
-msgstr "Izberite <gui>Da, uvozi podrobnosti mojega ra�una iz</gui> in kliknite <gui>Naprej</gui>."
+#: C/geolocation-turn.page:61(item/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 "V primeru da imate zunanjo napravo kot je GPS ali želite poslati bolj natan�en položaj, izberite primerno možnost v odseku <gui>Viri mesta</gui>."
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "Izberite izbirno bolje poleg vsakega ra�una, ki ga želite uvoziti."
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Razumevanje geo-lege."
 
-#: C/import-account.page:66(p)
-msgid "It is not currently possible to import accounts after you have completed the first-run assistant."
-msgstr "Trenutno ra�unov po kon�anju pomo�nika prvega zagona ni mogo�e uvažati."
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Kaj je geo-lega"
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr "Skritje nepovezanih stikov iz vašega <gui>Seznama stikov</gui>."
+#: C/geolocation-what-is.page:35(page/p)
+msgid "Geolocation allows you to identify the real geographical location of a computer or a device connected to the Internet."
+msgstr "Geo-lega vam omogo�a identifikacijo pravega geografskega položaja ra�unalnika ali naprave povezane na medmrežje."
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Skrij nepovezane stike"
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Z geo-lego v <app>Empathy</app> lahko:"
 
-#: 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."
-msgstr "Obi�ajno <app>Emapthy</app> prikaže vse vaše stike: povezane, s katerimi lahko imate pogovor, in nepovezane."
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Objavite svoj geografski položaj svojim stikom."
 
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Za skritje nepovezanih stikov:"
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "Oglejte si geografski položaj vaših stikov in hitro stopite v stik z njimi."
 
-#: C/hide-contacts.page:31(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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Nepovezani stiki</gui></guiseq> ali pritisnite <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+#: C/geolocation-what-is.page:52(item/p)
+msgid "Set the accuracy of your location and the device used to discover your location."
+msgstr "Nastavite natan�nost vašega položaja in napravo uporabljeno za odkritje vašega položaja."
 
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
-msgstr "Za ponoven prikaz nepovezanih stikov, ponovite postopek zgoraj."
+#: 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 "Za ogled geografskih položajev vaših stikov, morajo uporabiti storitev in program, ki podpira geo-lego."
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "Za�etek ali pridružitev skupinskemu pogovoru z vašimi stiki."
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Skupinski pogovori"
 
-#: 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."
 msgstr "Skupinski pogovori vam omogo�ajo besedilne pogovor z ve� kot enim stikom hkrati."
 
-#: 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 "Za skupinski pogovor morate imeti ustvarjen ra�un Jabber ali Google Talk ali ra�un Ljudje v bližini."
 
-#: 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."
 msgstr "Skupinske pogovore lahko imate le s stiki, ki uporabljajo enako storitev kot vi."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Za�enjanje skupinskega pogovora"
 
-#: 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 "V okno <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Pridruži se</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."
 msgstr "V spustnemu seznamu <gui>Ra�un</gui> izberite ra�un, ki ga želite uporabiti za skupinski pogovor."
 
-#: 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."
 msgstr "V besedilno polje <gui>Strežnik</gui> vnesite ime strežnika za gostovanje pogovora."
 
-#: 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 "Polje pustite prazno, �e bo soba na trenutnemu strežniku."
 
-#: 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."
 msgstr "V besedilno polje <gui>Soba</gui> vpišite ime, ki ga želite dati pogovoru."
 
-#: 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 to create a private room."
 msgstr "To bo bilo ime sobe za pogovor. To ime bo javno dostopno za druge ljudi, ki se želijo pridružiti. Zasebne sobe ni mogo�e ustvariti."
 
-#: 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 "Za povabilo drugih stikov v skupinski pogovor v oknu <gui>Seznam stikov</gui> izberite stik, ki ga želite povabiti, in izvedite nekaj od naslednjega:"
 
-#: 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 "Desno kliknite na stik in izberite <gui>Povabi v kelepetalnico</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>."
 msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Povabi v klepetalnico</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."
 msgstr "V primeru da imate odprt ve� kot en skupinski pogovor izberite tistega v katerega želite povabiti svoje stike."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Pridružitev skupinskemu pogovoru"
 
-#: 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 "Razširite odsek <gui>Seznam sob</gui> za ogled vseh obstoje�ih sob."
 
-#: 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 "Dvokliknite na ime sobe za pridružitev."
 
-#: 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 support these kind of rooms."
 msgstr "Ni se mogo�e povezati z vsemi obstoje�imi sobami. Nekatere sobe morda zahtevajo geslo, ali so dostopne le z vabilom. <app>Empathy</app> ne podpira teh vrst sob."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Razumevanje geo-lege."
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Skritje nepovezanih stikov iz vašega <gui>Seznama stikov</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Kaj je geo-lega"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Skrij nepovezane stike"
 
-#: 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 "Geo-lega vam omogo�a identifikacijo pravega geografskega položaja ra�unalnika ali naprave povezane na medmrežje."
+#: C/hide-contacts.page:21(page/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."
+msgstr "Obi�ajno <app>Emapthy</app> prikaže vse vaše stike: povezane, s katerimi lahko imate pogovor, in nepovezane."
 
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Z geo-lego v <app>Empathy</app> lahko:"
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "Za skritje nepovezanih stikov:"
 
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Objavite svoj geografski položaj svojim stikom."
+#: 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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Nepovezani stiki</gui></guiseq> ali pritisnite <keyseq><key>Ctrl</key><key>H</key></keyseq>."
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr "Oglejte si geografski položaj vaših stikov in hitro stopite v stik z njimi."
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "Za ponoven prikaz nepovezanih stikov, ponovite postopek zgoraj."
 
-#: C/geolocation-what-is.page:52(p)
-msgid "Set the accuracy of your location and the device used to discover your location."
-msgstr "Nastavite natan�nost vašega položaja in napravo uporabljeno za odkritje vašega položaja."
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Uvozite ra�un iz drugega programa hipnega sporo�anja."
 
-#: 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 "Za ogled geografskih položajev vaših stikov, morajo uporabiti storitev in program, ki podpira geo-lego."
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Kako omogo�iti in onemogo�iti geo-lego v <app>Empathy</app>."
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Uvoz obstoje�ega ra�una"
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Omogo�i/onemogo�i geo-lego"
+#: 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 "Ob prvem zagonu <app>Empathy</app>, vam bo ponudil uvoz ra�unov iz drugih programov hipnega sporo�anja. Trenutno je edini podprti program <app>Pidgin</app>."
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "Izberite <guiseq><gui>Uredi</gui><gui>Možnosti</gui></guiseq>."
+#: 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 "Prvi� poženite <app>Empathy</app>. Pomo�nik vam bo ponudil ve� možnosti za ustvarjanje novih ra�unov."
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Izberite zavihek <gui>Mesto</gui>."
+#: C/import-account.page:54(item/p)
+msgid "Select <gui>Yes, import my account details from</gui> and click <gui>Forward</gui>."
+msgstr "Izberite <gui>Da, uvozi podrobnosti mojega ra�una iz</gui> in kliknite <gui>Naprej</gui>."
 
-#: C/geolocation-turn.page:47(p)
-msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
-msgstr "Za omogo�enje geo-lege izberite <gui>Objavi položaj mojim stikom</gui> za objavo geo-lege."
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Izberite izbirno bolje poleg vsakega ra�una, ki ga želite uvoziti."
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Za onemogo�enje geo-lege odstranite njeno izbiro."
+#: C/import-account.page:66(note/p)
+msgid "It is not currently possible to import accounts after you have completed the first-run assistant."
+msgstr "Trenutno ra�unov po kon�anju pomo�nika prvega zagona ni mogo�e uvažati."
 
-#: C/geolocation-turn.page:55(p)
-msgid "To increase the accuracy of your position, deselect <gui>Reduce location accuracy</gui>."
-msgstr "Za pove�anje natan�nosti vašega položaja odstranite izbiro <gui>Zmanjšaj natan�nost položaja</gui>. "
+#. 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 "external ref='figures/empathy-main-window.png' md5='54908dcb2588beddb15ef0968d2c2582'"
+msgstr "external ref='figures/empathy-main-window.png' md5='54908dcb2588beddb15ef0968d2c2582'"
 
-#: 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 "V primeru da imate zunanjo napravo kot je GPS ali želite poslati bolj natan�en položaj, izberite primerno možnost v odseku <gui>Viri mesta</gui>."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Uvod v <app>Empathy</app> hipni sporo�evalnik."
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Storitve, ki podpirajo geo-lego in združljivost."
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Uvod"
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Podprte storitve"
+#: C/introduction.page:23(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."
+msgstr "<app>Empathy</app> je program hipnega sporo�anja za namizje GNOME. Podpira besedilno sporo�anje, zvo�ne in video klice, prenose datotek in najbolj uporabljene sisteme za sporo�anje kot sta MSN in Google Talk."
 
-#: 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 "Zmožnost geo-lege je trenutno združljiva le s storitvijo Jabber. Za uporabo zmožnosti morate imeti vi in vaš stik ra�un Jabber."
+#: C/introduction.page:28(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."
+msgstr "<app>Empathy</app> vklju�uje zmožnosti, ki vam pomagajo sodelovati pri delu in zmožnosti, ki vam omogo�ajo vzdrževanje stikov s svojimi prijatelji."
 
-#: 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 "Zahtevano je, da strežnik, ki ga uporabljate, podpira zmožnost geo-lege. Podpira jo ve�ina strežnikov Jabber. Za ve� podrobnosti si oglejte si dokumentacijo na spletiš�u vaše storitve."
+#: C/introduction.page:32(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."
+msgstr "Z <app>Empathy</app> lahko vse pogovore združite v eno okno, ali imate ve� oken za razli�ne vrste pogovorov; enostavno iš�ete skozi svoje predhodne pogovore in date svoje namizje v souporabo s samo dvema klikoma."
 
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Združljivost"
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Okno <gui>Seznam stikov</gui>"
 
-#: 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 "Zmožnost geo-lege <app>Empathy</app> ni združljiva z drugimi storitvami geografskih položajev kot so <em>Google Latitude</em>, <em>Yahoo Fire Eagle</em> ali <em>Brightkite</em>."
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Glavno okno <app>Empathy</app>"
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Kateri podatki so poslani in komu."
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "Glavno okno <app>Empathy</app>."
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Zasebnost Geo-lege"
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Podprti ukazi IRC"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Kateri podatki so poslani"
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Podprti ukazi IRC"
 
-#: 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 "Mogo�e je poslati: državo, regijo, krajevnost, podro�je, ulico, zgradbo, nadstropje, sobo, poštno številko, zemljepisno širino in dolžino, nadmorsko višino, hitrost in smer."
+#: C/irc-commands.page:19(page/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 "Za ogled seznama podprtih ukazov IRC v klepetalnico vpišite <input>/help</input> in pritisnite <key>Enter</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."
-msgstr "Natan�nost in kakovost podatkov o vašemu geografskemu položaju je odvisna od programov infrastrukture uporabljene za odkritje vašega položaja."
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "Vsi razpoložljivi ukazi imajo kratek opis njihove uporabe. "
 
-#: C/geolocation-privacy.page:44(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 "Druga�ne vrste omrežij imajo morda razli�ne vrste natan�nosti in lahko pošljejo razli�ne podatke. Uporaba zunanjih naprav kot sta GPS in mobilni telefon bo pove�alo natan�nost poslanih podatkov."
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Vstop v z geslom zaš�itene klepetalnice IRC."
 
-#: 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 "Ko je omogo�en na�in zasebnosti, ne bo poslano ni� bolj natan�no kot vaše mesto, tudi �e uporabljate zunanjo napravo."
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Pridružitev zaš�iteni klepetalnici IRC"
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Kdo lahko vidi poslane podatke"
+#: C/irc-join-pwd.page:27(page/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 "Na nekaterih omrežjih IRC so zasebne sobe IRC morda zaš�itene z geslom. Če geslo poznate, uporabite naslednje korake za pridružitev:"
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Vaš geografski položaj lahko vidijo le vaši stiki."
+#: 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\">Pridružite se sobi</link> kot obi�ajno."
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Kaj je na�in zasebnosti"
+#: C/irc-join-pwd.page:38(item/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 vas bo pozval za geslo. Vpišite geslo klepetalnice IRC in kliknite na <gui style=\"button\">Pridruži se</gui>."
 
-#: 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 "Na�in zasebnosti je privzeto omogo�en na�in zmanjšane natan�nosti, ki bo zmanjšal natan�nost geografskega položaja poslanega vašim stikom."
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Pridružitev kanalu IRC"
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Pregled zasebnosti"
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Pridružitev klepetalnici IRC"
 
-#: C/geolocation-privacy.page:72(p)
-msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
-msgstr "Pregled razli�nih nastavitev zasebnosti geo-lege v <app>Empathy</app>. "
+#: 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 "Pridružite se lahko klepetalnicam IRC (poznane so tudi kot kanali IRC) na kateremukoli omrežju IRC. Za povezavo z omrežjem IRC si oglejte <link xref=\"add-account\"/> in <link xref=\"account-irc\"/>."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "Geolega privzeto ni omogo�ena."
+#: C/irc-join-room.page:45(item/p)
+msgid "From the <gui>Account</gui> drop-down list, select the IRC account that corresponds to the network you want to use."
+msgstr "V spustnemu seznamu <gui>Ra�un</gui> izberite ra�un IRC, ki ustreza omrežju, ki ga želite uporabiti."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "Na�in zasebnosti je privzeto omogo�en."
+#: 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 "V besedilno polje <gui>Soba</gui> vnesite ime kanala, ki se mu želite pridružiti. Imena kanalov IRC se za�nejo z znakom (<sys>#</sys>)."
 
-#: C/geolocation-privacy.page:87(p)
-msgid "Privacy mode prevails even when using external and more precise devices."
-msgstr "Na�in zasebnosti prevlada celo pri uporabi zunanjih in bolj natan�nih naprav."
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Kliknite <gui>Pridruži se</gui> za vstop v sobo."
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Vaš položaj lahko vidijo le vaši stiki."
+#: C/irc-join-room.page:64(note/p)
+msgid "To join multiple rooms, you need to repeat the steps above for each room."
+msgstr "Za pridružitev ve� sobam boste morali ponoviti korake zgoraj za vsako sobo."
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> ne objavi mojega geografskega položaja."
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Kako uporabiti IRC z <app>Empathy</app>."
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Geografska lega ni objavljena"
+#: C/irc-manage.page:34(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Klepet 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."
-msgstr "V primeru da vaši stiki ne morejo videti vašega položaj, <app>Empathy</app> morda ne more odkriti vašega geografskega položaja z dobro natan�nostjo. "
+#: C/irc-manage.page:41(when/p)
+msgid "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button\">Install telepathy-idle</link>"
+msgstr "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button\">Namestite telepathy-idle</link>"
 
-#: C/geolocation-not-showing.page:38(p)
-msgid "In this case, your position will not be published, but you are still able to see the location of your contacts."
-msgstr "V temu primeru vaš položaj ne bo objavljen, toda še vedno boste lahko videli položaje vaših stikov."
+#: C/irc-manage.page:48(info/title)
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "Pogovori in klepetalnice IRC"
 
-#: 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 "V primeru da želite objaviti vaš geografski položaj, lahko poskusite z uporabo zunanje naprave kot je GPS."
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Klepetalnice in pogovori"
 
-#: 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 "Za objavo svojega geografskega položaja, mora vaš strežnik Jabber podpirati Osebni protokol dogodkov (PEP). Seznam <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">strežnikov s podporo PEP</link> je vdrževan na spletu. Google Talk trenutno te zmožnosti ne podpira."
+#: C/irc-manage.page:55(info/title)
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Pogoste težave z IRC-em"
 
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Uporabite in razumite geolego v <app>Empathy</app>."
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Zaš�itite vaš vzdevek in prepre�ite da bi ga uporabljali drugi uporabniki IRC."
 
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Geografska lega"
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Uporaba gesla vzdevka na IRC-u"
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Geo-lega"
+#: C/irc-nick-password.page:35(page/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 "Na nekaterih omrežjih IRC lahko ustvarite svoj vzdevek s storitvijo z imenom NickServ. S pošiljanjem posebnih sporo�il NickServ lahko nastavite svojo geslo in se identificirate. Nekatere sobe klepeta IRC vam morda ne dovolijo pridružitve brez vpisanega vzdevka. "
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Popravi pogoste napake"
+#: C/irc-nick-password.page:40(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> trenutno ne podpira ustvarjanja vzdevkov. Nekatera omrežja IRC bodo NickServ samodejno posredovala <em>geslo strežnika</em>. Na teh omrežjih lahko uporabite geslo IRC v <app>Empathy</app> za identifikacijo sebe NickServ. Priljubljeno omrežje FreeNode ima to zmožnost."
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Nastavite, pridružite se in upravljajte priljubljene sobe."
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "Za nastavitev gesla strežnika IRC:"
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Priljubljene sobe"
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Izberite ra�un IRC s seznama na levi strani pogovornega okna."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Nastavi sobo kot priljubljeno"
+#: 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 "V polje <gui>Geslo</gui> vtipkajte geslo, ki ste ga uporabili za ustvarjanje svojega vzdevka."
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Pridružite se sobi."
+#: 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 "Ta navodila vam dovolijo uporabo z geslom zaš�itenega vzdevka na dolo�enih omrežjih IRC. Trenutno z <app>Empathy</app> ni mogo�e ustvariti vzdevka IRC ali spremeniti svojega vzdevka ali gesla. "
 
-#: C/favorite-rooms.page:40(p)
-msgid "See <link xref=\"irc-join-room\"/> for more information on how to join an IRC room."
-msgstr "Za ve� podrobnosti kako se pridružiti sobi IRC si oglejte <link xref=\"irc-join-room\"/>. "
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> trenutno ne podpira pošiljanja datotek preko IRC-a."
 
-#: 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 "Za ve� podrobnosti kako za�eti ali se pridružiti skupinskemu pogovoru si oglejte <link xref=\"group-conversations\"/>."
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Pošiljanje datotek preko IRC-a"
 
-#: C/favorite-rooms.page:54(p)
-msgid "From the conversation window, choose <guiseq><gui>Conversation</gui><gui>Favorite Chat Room</gui></guiseq>."
-msgstr "V oknu pogovora izberite <guiseq><gui>Pogovor</gui><gui>Priljubljena klepetalnica</gui></guiseq>."
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Trenutno preko IRC-a ni mogo�e pošiljati datotek."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Pridruži se priljubljenim sobam"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Za�etek pogovora s stikom IRC."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Pritisnite <key>F5</key>."
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Klepet z nekom na IRC-u"
 
-#: C/favorite-rooms.page:76(p)
-msgid "Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all your favorite rooms."
-msgstr "Izberite <guiseq><gui>Soba</gui><gui>Pridruži se priljubljenim</gui></guiseq>, za pridružitev vsem vašim priljubljenim sobam."
+#: 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 "Z drugimi uporabniki IRC imate lahko zasebne pogovore zunaj javnih klepetalnic IRC. Za za�etek pogovora z drugim uporabnikom IRC:"
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "Izberite <gui>Soba</gui> in izberite sobo, ki se ji želite pridružiti."
+#: C/irc-start-conversation.page:37(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>."
+msgstr "Na seznamu stikov klepetalnice IRC dvokliknite ime uporabnika s katerim želite klepetati. Namesto tega lahko desno kliknete na ima uporabnika in izberete <gui>Klepet</gui>."
 
-#: 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 "Za pridružitev priljubljeni sobi morate biti povezani z medmrežjem in z vašim ra�unom."
+#: C/irc-start-conversation.page:45(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."
+msgstr "Seznam stikov sobe IRC ni enak kot seznam stikov <app>Empathy</app>. Vsebuje seznam uporabnikov v klepetalnicah IRC, ki ste se jim pridružili. Razli�ne sobe imajo lahko razli�ne sezname stikov."
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Upravljanje s priljubljenimi sobami"
+#: C/irc-start-conversation.page:52(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>."
+msgstr "Seznam stikov sobe IRC je obi�ajno na desni strani okna sobe IRC. V primeru da ga ne vidite izberite <guiseq><gui>Pogovor</gui><gui>Pokaži seznam stikov</gui></guiseq>."
 
-#: 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 "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Soba</gui><gui>Upravljaj priljubljene</gui></guiseq>."
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Pravni podatki."
 
-#: 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 "V spustnemu seznamu <gui>Ra�un</gui> izberite ra�un, katerega priljubljene sobe želite upravljati."
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Licenca"
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Izberite <gui>Vse</gui> za ogled vseh svojih priljubljenih sob."
+#: C/license.page:12(page/p)
+msgid "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 Unported license."
+msgstr "Ta delo je distribuirano pod CreativeCommons Attribution-Share Alike 3.0 Unported license."
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Izberite priljubljeno sobo, ki jo želite upravljati:"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Prosto lahko:"
 
-#: 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 "Izberite izbirno polje <gui>Samodejna povezava</gui> za samodejno povezovanje s to sobo, ko se povežete s svojim ra�unom."
+#: C/license.page:25(item/title)
+msgid "<em>To share</em>"
+msgstr "<em>Delite</em>"
 
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "Za odstranitev sobe iz svojih priljubljenih kliknite na <gui>Odstrani</gui>."
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Za kopiranje, distribuiranje in prenašanje dela."
 
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Ko ste kon�ali, kliknite <gui>Zapri</gui>."
+#: C/license.page:29(item/title)
+msgid "<em>To remix</em>"
+msgstr "<em>Predelate</em>"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "Prepre�itev samodejnega prijavljanja <app>Empathy</app> v ra�un."
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Prilagajanje dela"
 
-#: C/disable-account.page:40(title)
-msgid "Disable an account"
-msgstr "Onemogo�itev ra�una"
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Pod naslednjimi pogoji:"
 
-#: 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 "Za prepre�itev prijave v <app>Empaty</app> brez odstranitve ra�una lahko ra�un onemogo�ite. Morda želite ra�un onemogo�iti in ponovno omogo�iti v primeru da želite biti v ra�un prijavljeni le ob dolo�enih �asih, toda želite <app>Empathy</app> še vedno uporabiti za druge ra�une. "
+#: C/license.page:38(item/title)
+msgid "<em>Attribution</em>"
+msgstr "<em>Priznanje avtorstva</em>"
 
-#: 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 "Izberite ra�un, ki ga želite onemogo�iti, s seznama ra�unov na levi strani okna."
+#: C/license.page:39(item/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 "Delo morate prilastiti na na�in, ki ga je navedel avtor ali dajalec licence (toda ne na kakršenkoli na�in, ki predlaga spodbudo vas ali vaše uporabe dela)."
 
-#: C/disable-account.page:57(p)
-msgid "On the right side of the window, switch it off."
-msgstr "Na desni strani okna ga izklopite."
+#: C/license.page:46(item/title)
+msgid "<em>Share Alike</em>"
+msgstr "<em>Deljenje pod enakimi pogoji</em>"
 
-#: C/disable-account.page:62(p)
-msgid "To re-enable the account, switch it on."
-msgstr "Za ponovno omogo�itev ra�una ga vklopite."
+#: 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 "V primeru da spremenite, preoblikujete ali nadgradite to delo, lahko nastalo delo distribuirate le pod enako, podobno ali združljivo licenco."
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Ustvarjanje ra�una z eno od podprtih storitev sporo�anja."
+#: C/license.page:53(page/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 "Za polno besedilo licence si oglejte <link href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">spletiš�e CreativeCommons</link>, ali preberite polno besedilo<link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons Deed</link>."
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Ustvarjanje novega ra�una"
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Združite in lo�ite razli�ne stike v enega."
 
-#: 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 "Ve�ina vrst ra�unov pred povezovanjem s programom hipnega sporo�anja kot je <app>Empathy</app> zahteva ustvarjanje ra�una s ponudnikom ra�una. Za nekatere ponudnike ra�unov je mogo�e za ustvarjanje novega ra�una uporabiti <app>Empathy</app> z uporabo enakih korakov kot za  <link xref=\"add-account\">dodajanje ra�una</link>."
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Združevanje in lo�evanje stikov"
 
-#: 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 "Ta stran zagotavlja podatke o ustvarjanju novih ra�unov za razli�ne vrste ra�unov. Vaš ponudnik ra�una vam bi moral dati ID prijave in geslo ter morebitne dodatne podatke, ki jih potrebujete za povezavo z <app>Empathy</app>."
+#: 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 "Če ima eden ali ve� vaših stikov ve� ra�unov z razli�nimi storitvami sporo�anja, jih lahko združite v enega."
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: 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 "Nastali stik se imenuje <em>meta-stik</em>: stik sestavljen iz ve� razli�nih stikov."
 
-#: 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 je eno od najbolj uporabljanih družabnih omrežij. Uporabnikom dovoljuje ustvarjanje njihovega lastnega profila in komunikacijo s prijatelji."
+#: C/link-contacts.page:34(page/p)
+msgid "If you have a Jane Smith contact that is using three different messaging services like:"
+msgstr "V primeru da imate Janeza Novaka, ki uporablja tri razli�ne storitve sporo�anja kot:"
 
-#: 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 "Za uporabo Facebooka za komunikacijo s prijatelji boste morali ustvariti nov ra�un na spletni strani: <link href=\"http://www.facebook.com\">www.facebook.com</link>."
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "janez@facebook"
 
-#: C/create-account.page:60(title)
-#: C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "janez.novak@gmail"
 
-#: 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 je odprt sistem takojšnjega sporo�anja. Tako kot elektronska pošta, vam Jabber omogo�a izbiro vašega ponudnika ra�una in sporo�anje z vsemi drugimi uporabniki Jabber ne glede na njihovega ponudnika ra�una. "
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "janez_novak@hotmail"
 
-#: 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 "S ponudnikom Jabber boste morali ustvariti nov ra�un. Obstaja veliko brezpla�nih podudnikov; en priljubljen ponudnik je <link href=\"http://register.jabber.org/\">Jabber.org</link>."
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Te stike lahko združite v en stik Janez Novak."
 
-#: 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 "V primeru da uporabljate GMail ali Google Talk že imate ra�un Jabber. Google Talk je storitev Jabber. Za povezavo v <app>Empathy</app> enostavno uporabite svoj GMail naslov in geslo.  "
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Združevanje stikov"
 
-#: C/create-account.page:78(title)
-#: C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Ljudje v bližini"
+#: C/link-contacts.page:63(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>."
+msgstr "V oknu <gui>Seznam stikov</gui> desno kliknite na enega od stikov, ki ima razli�ne ra�una in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
 
-#: 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 "Za uporabo te zmožnosti vam ni treba ustvariti ra�una s ponudnikom storitve. Ta storitev deluje kadarkoli ste povezani na krajevno omrežje kot je brezži�na vro�a to�ka. Samodejno najde ostale uporabnike na omrežju, ki tudi uporabljajo to storitev."
+#: C/link-contacts.page:70(item/p)
+msgid "From the left pane in the <gui>Link Contacts</gui> window, select the contacts you want to combine."
+msgstr "V levem pladnju v oknu <gui>Poveži stike</gui> izberite stike, ki jih želite združiti."
 
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "Za ve� podrobnosti si oglejte <link xref=\"salut-protocol\"/>."
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Kliknite <gui style=\"button\">Poveži</gui>."
 
-#: C/create-account.page:89(title)
-#: C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+#: C/link-contacts.page:82(note/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 "Ko je bil meta-stik ustvarjen, bo za pogovarjanje uporabljen stik z najpogostejšo povezanostjo."
 
-#: 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 je odprt sistem, ki uporabnikom omogo�a zvo�ne in video pogovore preko medmrežja. S ponudnikom SIP morate ustvariti ra�un. Sporazumevate se lahko z vsemi drugimi uporabniki SIP, ne glede na to katerega ponudnika SIP uporabljajo."
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "Lo�evanje stikov"
 
-#: 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 "Zaradi tehni�nih razlik brezpla�na storitev <link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> ne deluje z <app>Empathy</app>."
+#: C/link-contacts.page:94(item/p)
+msgid "From the <gui>Contact List</gui>, right-click the contact to separate, and select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr "V <gui>Seznamu stikov</gui> desno kliknite na stik za lo�evanje in izberite <gui style=\"menuitem\">Poveži stike ...</gui>."
 
-#: 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 "Nekateri podnudniki SIP vam z vašega ra�unalnika omogo�ajo klic na obi�ajne telefone. V splošnem se morate za uporabo te zmožnosti naro�i na pla�ljivo storitev. "
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Kliknite <gui style=\"button\">Razveži</gui>."
 
-#: C/create-account.page:107(title)
-#: C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Brskanje ali iskanje po preteklih pogovorih."
 
-#: 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 "Za uporabo IRC-a vam ni treba ustvariti ra�una. Čeprav ob dodajanju ra�una IRC v <app>Empathy</app> navedete vzdevek, je vzdevek vzpostavljen ob vsaki povezavi. V primeru da vzdevek uporablja drug uporabnik, boste morali izbrati nov vzdevek. "
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Ogled preteklih pogovorov"
 
-#: 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."
-msgstr "Nekatera omrežja IRC uporabljajo storitev z imenom NickServ, ki uporabnikom omogo�a zaš�ito njihovih vzdevkov. Za ve� podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+#: C/prev-conv.page:38(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."
+msgstr "<app>Empathy</app> samodejno shrani vse vaše besedilne pogovore z vašimi stiki. Lahko <link xref=\"#search\">iš�ete po vseh vaših predhodnih pogovorih</link> ali <link xref=\"#browse\">brskate predhodne pogovore</link> po stiku in datumu."
 
-#: 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."
-msgstr "Nekateri strežniki IRC so zaš�iteni z geslom. Za povezavo s temi strežniki boste morali poznati geslo. V splošnem so to zasebna omrežja IRC."
+#: C/prev-conv.page:46(note/p)
+msgid "You do not need to be connected to the Internet to view and search your previous conversations."
+msgstr "Za ogled in iskanje vaših predhodnih pogovorov vam ni treba biti povezan na medmrežje."
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Lastniške storitve"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Iskanje predhodnih pogovorov"
 
-#: C/create-account.page:124(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."
-msgstr "Razli�na podjetja in organizacije so razvile veliko lastniških storitev hipnega sporo�anja. <app>Empathy</app> vam omogo�a povezavo z obstoje�im ra�unom za ve�ino priljubljenih storitev. Za ustvarjanje novega ra�una z eno od teh storitev boste morali obiskati spletiš�e storitve in se strinjati s pogoji uporabe."
+#: C/prev-conv.page:55(section/p)
+msgid "You can perform a full-text search through all of your previous conversations."
+msgstr "Izvedete lahko iskanje celega besedila skozi vse vaše predhodne pogovore."
 
-#: C/create-account.page:133(link)
-#: C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
+#: 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>."
+msgstr "V oknu <gui>Seznam stikov</gui> izberite <guiseq><gui>Pogled</gui><gui>Pretekli pogovori</gui></guiseq>. Namesto tega lahko pritisnete <key>F3</key>."
 
-#: C/create-account.page:138(link)
-#: C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
+#: C/prev-conv.page:63(item/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 "Izberite ra�un s spustnega seznama na vrhu. Seznam vseh stikov in klepetalnic za ta ra�un bo prikazan spodaj."
 
-#: C/create-account.page:143(link)
-#: C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
+#: C/prev-conv.page:67(item/p)
+msgid "Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Vnesite besedilo, ki ga želite najti, v besedilno polje <gui>Iskanje</gui>."
 
-#: C/create-account.page:148(link)
-#: C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
+#: C/prev-conv.page:71(item/p)
+msgid "Any conversations that matched your search terms will be shown. By default, conversations are ordered by date."
+msgstr "Katerikoli pogovori, ki se skladajo z vašimi iskalnimi pogoji bodo prikazani v seznamu pod iskalnim poljem. Privzeto so pogovori razvrš�eni po datumu."
 
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "Spremenite svoje stanje za oglaševanje vaše razpoložljivosti vašim stikom."
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Brskaj predhodne pogovore"
 
-#: C/change-status.page:39(title)
-msgid "Change your status"
-msgstr "Sprememba stanja"
+#: C/prev-conv.page:82(section/p)
+msgid "You can browse your previous conversations with your contacts or in chat rooms by date."
+msgstr "Svoje predhodne pogovore s svojimi stiki ali klepetalnicami lahko brskate po datumu."
 
-#: C/change-status.page:41(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."
-msgstr "Nastavite lahko svoje stanje za nakaz vaše razpoložljivosti vašim stikov. <app>Empathy</app> vam omogo�a izbiro s seznama dolo�enih stanj."
+#: C/prev-conv.page:91(item/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 "Izberite ra�un s spustnega seznama zgoraj levo. Seznam vseh stikov in klepetalnic za ta ra�un bo prikazan spodaj."
 
-#: C/change-status.page:46(p)
-msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr "Kliknite na spustni seznam na vrhu okna <gui>Seznam stikov</gui>."
+#: C/prev-conv.page:95(item/p)
+msgid "Select a contact or chat room to view your previous conversations from. By default the most recent conversation will be shown."
+msgstr "Izberite stik ali klepetalnico za ogled svojih predhodnih pogovorov. Privzeto bodo prikazani najbolj nedavni stiki."
 
-#: C/change-status.page:51(p)
-msgid "Select a status from the list."
-msgstr "Izberite stanje s seznama"
+#: C/prev-conv.page:99(item/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 "Svoje pogovore lahko brskate po datumu. Dnevi ob katerih ste imeli pogovor z izbranim stikom bodo prikazni krepko. Kliknite na datum za izbiro. Kliknite puš�ice poleg meseca in leta za brskanje zgodnejših datumov."
 
-#: C/change-status.page:57(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."
-msgstr "Oglejte si <link xref=\"status-icons\"/> za seznam vgrajenih stanj in kaj pomenijo.  Lahko tudi <link xref=\"set-custom-message\">dodate sporo�ila stanja po meri</link> za ve� podrobnosti o vaši razpoložljivosti svojim stikom."
+#: 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 "Besedilo v prikazanemu pogovoru lahko iš�ete s pisanjem v iskalno polje na vrhu. Skladajo�e besedilo bo poudarjeno."
 
-#: 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."
-msgstr "V primeru da svojega ra�unalnika nekaj �asa ne uporabljate, ali �e je ohranjevalnik zaslona vklopljen bo stanje samodejno nastavljeno na Odsoten."
+#: C/prev-conv.page:111(note/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 "Predhodne pogovore z enim od svojih stikov si lahko hitro ogledate v oknu <gui>Seznam stikov</gui>. Desno kliknite na stik in izberite <gui>Ogled predhodnih pogovorov</gui>. Odprlo se bo okno <gui>Predhodni pogovori</gui> s predhodno izbranim stikom."
 
-#. 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/prob-conn-acctdisabled.page:7(info/desc)
+msgid "The instant messaging account that you want to use is not enabled in the list of accounts."
+msgstr "Ra�un hipnega sporo�anja, ki ga želite uporabiti ni omogo�en na seznamu ra�unov."
 
-#: C/audio-video.page:8(desc)
-msgid "Information on when it is possible to have an audio or video conversation."
-msgstr "Podatki kdaj je mogo�e imeti zvo�ni ali video pogovor."
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "Moj ra�un ni omogo�en"
 
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Podpora za zvok in video"
+#: C/prob-conn-acctdisabled.page:36(page/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 "V primeru da ra�un hipnega sporo�anja, ki ga želite uporabiti, v spustnemu seznamu ra�unov ob poskusu za�etka novega pogovora ali pridružitve sobe ni omogo�en, so morda podrobnosti vašega ra�una nepravilne. "
 
-#: C/audio-video.page:34(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 "Zvo�ne in video pogovor imate lahko le s stiki, ki uporabljajo program s podporo te zmožnosti. V primeru da vaši stiki podpirajo zvo�ne ali video pogovore lahko vidite naslednje ikone poleg njihovih imen na seznamu stikov:"
+#: 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 "Prepri�ajte se, da ste povezani na medmrežje ali na krajevno omrežje."
 
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Ikona"
+#: 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 "Izberite <guiseq><gui>Uredi</gui><gui>Ra�uni</gui></guiseq> in izberite ra�un, ki ne deluje."
 
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Opis"
+#: C/prob-conn-acctdisabled.page:55(item/p)
+#: C/prob-conn-auth.page:63(item/p)
+msgid "Type your username and password again to make sure that they are correct."
+msgstr "Ponovno vpišite svoje uporabniško ime in geslo ter se prepri�ajte da sta pravilna."
 
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Ikona za zvo�ni pogovor"
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/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 odseku <gui>Napredno</gui> preverite, da so vse podrobnosti pravilne. Te podrobnosti bi morali najti na spletiš�u storitve sporo�anja."
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "Stik lahko ima zvo�ni pogovor."
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Preverite, da je ra�un vklopljen."
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Ikona za video pogovor"
+#: C/prob-conn-auth.page:8(info/desc)
+msgid "An error message which says “<gui>Authentication failed</gui>� appears in the main window."
+msgstr "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi “<gui>Overitev je spodletela</gui>�."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "Stik lahko ima video pogovor."
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Dobil sporo�ilo, ki pravi “Overitev je spodletela�"
 
-#: C/audio-video.page:83(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."
-msgstr "Za zvo�ni pogovor morate imeti zvo�no kartico, ki jo vaš operacijski sistem podpira, in delujo�i mikrofon. "
+#: 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 "Ta vrsta napake se zgodi, ko vam storitev takojšnjega sporo�anja ne dovoli povezave ker zaradi nekega vzroka ne prepozna vašega uporabniškega imena ali gesla."
 
-#: C/audio-video.page:87(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."
-msgstr "Za video pogovor morate imeti spletno kamero, ki jo vaš operacijski sistem podpira, in delujo�i mikrofon."
+#: 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 "Prepri�ajte se, da ste ustvarili ra�un za storitev s katero se želite povezati. V primeru da nimate ra�una, vam ve�ina storitev ne bo dovolila povezave."
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Podprte vrste ra�unov"
+#: 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 "V sporo�ilu napake kliknite na ikono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\">uredi</media>."
 
-#: 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 "Video in zvo�ne pogovore imate lahko le z uporabo ra�unov na dolo�enih podprtih storitvah. Naslednja razpredelnica našteva ali sta zvok in video podprta za vsako vrsto ra�una."
+#: 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 "Odstranite izbiro <gui>Omogo�eno</gui> in jo nato ponovno izberite za poskus ponovne povezave s storitvijo."
 
-#: C/audio-video.page:102(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 "Vrste ra�unov zagotavljajo vstavki. Vaš sistem morda nima na voljo vseh slede�ih vrst, ali morda vsebuje vrste, ki tukaj niso naštete. Posodobljeni vstavki lahko omogo�ijo zvo�ni ali video klepet na vrstah ra�unov, ki so tukaj naštete kot nepodprte."
+#: C/prob-conn-name.page:9(info/title)
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "“Ime v uporabi�"
 
-#: C/audio-video.page:110(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."
-msgstr "Želim narediti razporeditve kot je ta z uporabo Ne in ✔ za Ja, toda potrebno je pogledati vpliv na dostopnost. Za mnenje sem <link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">vprašal ekipo dostopnosti</link> ."
+#: 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 "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi  “<gui>Ime v uporabi</gui>�."
 
-#: 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 "Nedavno delo na telepathy-butterfly in papayon podpira zvok in video za MSN. Morda bo podpora izšla v 2.28, toda ker ne sledi razporeditvi izdaje Gnome, ni mogo�e biti prepri�an. V primeru da je videti, kot da bo podpora izšla, jo bom ozna�il z Da."
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Dobim sporo�ilo, ki pravi “Ime v uporabi� "
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Storitev"
+#: 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 "Ta vrsta napak se zgodi, ko se poskusite povezati s svojim ra�unom IRC in uporabljate vzdevek, ki ga na istemu omrežju že uporablja nekdo drug. "
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Zvok"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "V besedilno polje <gui>Vzdevek</gui> vpišite nov vzdevek."
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Video"
+#: 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 "V primeru da ste ta vzdevek ustvarili v omrežju, ki ga uporabljate, nastavite geslo za ta vzdevek. Za ve� podrobnosti si oglejte  <link xref=\"irc-nick-password\"/>."
 
-#: 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 "Ne"
+#: C/prob-conn-name.page:65(item/p)
+#: C/prob-conn-neterror.page:79(item/p)
+msgid "Switch the account off, and then switch it on to try to reconnect to the service."
+msgstr "Izklopite ra�un in ga ponovno vklopite za poskus ponovne povezave s storitvijo."
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook klepet"
+#: C/prob-conn-neterror.page:7(info/desc)
+msgid "An error message which says “<gui>Network error</gui>� appears in the main window."
+msgstr "V glavnemu oknu se pojavi sporo�ilo napake, ki pravi  “<gui>Network error</gui>�."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Dobim sporo�ilo, ki pravi “Napaka omrežja�"
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/prob-conn-neterror.page:42(page/p)
+msgid "This kind of error happens when <app>Empathy</app> cannot communicate with the instant messaging service for some reason."
+msgstr "Ta vrsta napake se zgodi, ko <app>Empathy</app> zaradi nekega vzroka ne more komunicirati s storitvijo hipnega sporo�anja. "
 
-#: 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 "Da"
+#: 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 "Ta vrsta napake se zgodi, ko poskušate uporabiti ra�un IRC brez nastavitve vzdevka."
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Podpora posredniških strežnikov"
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: 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 "Trenutno <app>Empathy</app> ni mogo�e nastaviti za delo s posredovalnim strežnikom."
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr "Diagnoza pogostih težav pri povezovanju s storitvijo takojšnjega sporo�anja."
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Težave s povezovanjem s storitvijo hipnega sporo�anja"
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Popolnoma odstrani ra�un iz <app>Empathy</app>."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Odstranitev ra�una"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Klic vaših stikov preko medmrežja."
+#: 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 "V primeru da ra�una ne želite ve� uporabljati, lahko ra�un popolnoma odstranite iz <app>Empathy</app>. V primeru da želite v prihodnosti ra�un v <app>Empathy</app> ponovno uporabljati boste morali ponovno dodati podrobnosti svojega ra�una."
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Za�enjanje zvo�nega pogovora"
+#: 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 "Na seznamu ra�unov na levi strani okna izberite ra�un, ki ga želite odstraniti."
 
-#: 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 "Svoje stike lahko pokli�ete in imate z njimi zvo�ni pogovor. Ta zmožnost deluje le z dolo�enimi vrstami ra�unov in pod pogojem da ima druga oseba program, ki podpira zvo�ne klice."
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Kliknite <gui style=\"button\">-</gui>."
 
-#: 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 "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati in izberite <gui style=\"menuitem\">Zvo�ni klic</gui>."
+#: 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 "Pojavilo se pogovorno okno, ki vas bo spraševalo za potrditev. Kliknite gumb <gui>Odstrani</gui> za odstranitev ra�una."
 
-#: 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 "Za pretvorbo zvo�nega pogovora v video pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Vklopi</gui></guiseq>."
+#: 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 "Tudi po odstraniti ra�una <app>Empathy</app> ne izbriše zgodovine vaših pogovorov za ta ra�un."
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Za�etek zvo�nega pogovora z meta-stikom"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Razumevanje zmožnosti ljudje v bližini."
 
-#: C/audio-call.page:71(p)
-msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Audio Call</gui>."
-msgstr "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui>Zvo�ni klic</gui>."
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Kaj je \"Ljudje v bližini\"?"
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Dodajanje nekoga na seznam stikov."
+#: 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 "Storitev ljudje v bližini je storitev sporo�anja brez strežnika: za uporabo se vam ni potrebno povezati in overiti s centralnim strežnikom."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Dodajanje nekoga na vaš seznam stikov"
+#: 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 "Ta vrsta sistema sporo�anja brez strežnika je omejena na krajevno omrežje in dejavna medmrežna povezava ni potrebna."
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr "Izberite <guiseq><gui>Klepet</gui><gui>Dodaj stik</gui></guiseq>."
+#: 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 "Ljudje, ki uporabljajo to storitev znotraj istega krajevnega omrežja, bodo samodejno odkriti in mogo�e jim bo poslati sporo�ila in datoteke kot z ostalimi storitvami. "
 
-#: 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."
-msgstr "Na spustnemu seznamu <gui>Ra�un</gui> izberite ra�un, ki ga želite uporabiti za povezovanje z vašim stikom. Vaš stik bo moral uporabiti isto storitev kot ra�un, ki ste ga izbrali."
+#: C/salut-protocol.page:54(page/p)
+msgid "All the modern local area networks should be able to support this kind of service."
+msgstr "Vsa novejša krajevna omrežja bi morala podpirati to vrsto storitve."
 
-#: C/add-contact.page:45(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."
-msgstr "V polju <gui>Dolo�ilo</gui> vnesite ID vašega stika, uporabniško ime, prikazano ime ali drugo primerno dolo�ilo za vrsto storitve."
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Pošljite datoteko s svojega ra�unalnika enemu od svojih stikov."
 
-#: C/add-contact.page:49(p)
-msgid "In the <gui>Alias</gui> field, type your contact’s name as you would like it to appear in your contact list."
-msgstr "V polje <gui>Vzdevek</gui> vtipkajte ime vašega stika, kot naj se pojavi v vašemu seznamu stikov."
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Pošiljanje datotek"
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr "Za dodajanje osebe na vaš seznam stikov kliknite <gui>Dodaj</gui>."
+#: C/send-file.page:45(item/p)
+msgid "Right click on the contact you want to send a file to, and choose <gui>Send file</gui>."
+msgstr "Desno kliknite na stik, kateremu želite poslati datoteko in izberite <gui>Pošlji datoteko</gui>."
 
-#: C/add-contact.page:61(p)
-msgid "To add a new person to your list of contacts, you need to be connected to the Internet and to your account."
-msgstr "Za dodajanje nove osebe na vaš seznam stikov morate biti povezani na medmrežje in na vaš ra�un."
+#: 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>."
+msgstr "Kliknite na stik, kateremu želite poslati datoteko in izberite <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Pošlji datoteko</gui></guiseq>."
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Dodajanje novega ra�una v <app>Empathy</app>."
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Izberite datoteko za pošiljanje in kliknite na <gui>Pošlji</gui>."
 
-#: C/add-account.page:40(title)
-msgid "Add a new account"
-msgstr "Dodajanje novega ra�una"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Pojavilo se bo okno <gui>Prenosi datotek</gui>."
 
-#: C/add-account.page:42(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\"/>."
-msgstr "Ra�une hipnega sporo�anja za sporazumevanje z vsemi svojimi stiki v <app>Empathy</app> lahko dodate s katerekoli podprte naprave. Za nekatere ponudnike ra�unov vam bodo ti koraki omogo�ili tudi ustvarjanje novega ra�una. Za ve� podrobnosti si oglejte <link xref=\"create-account\"/>."
+#: C/send-file.page:66(item/p)
+msgid "Wait for your contact to accept the file transfer, or click <gui>Stop</gui> to halt the transfer."
+msgstr "Po�akajte da vaš stik sprejme prenos datotek ali kliknite <gui>Zaustavi</gui> za zaustavitev prenosa."
 
-#: C/add-account.page:53(p)
-msgid "Click <gui style=\"button\">+</gui>."
-msgstr "Kliknite <gui style=\"button\">+</gui>."
+#: 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 "Ko je prenos kon�an, je mogo�e okno <gui>Prenosi datotek</gui> zapreti."
 
-#: C/add-account.page:58(p)
-msgid "From the <gui>Protocol</gui> drop-down list, select the type of account you wish to add."
-msgstr "Na spustnemu seznamu <gui>Protokol</gui> izberite vrsto ra�una, ki jo želite dodati."
+#: 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 "V primeru da imate v oknu ve� kon�anih prenosov, kliknite na <gui>Po�isti</gui> za spraznjene seznama. To bo datoteke le odstranilo s seznama in jih ne bo izbrisalo z vašega ra�unalnika."
 
-#: 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 "V primeru da še niste ustvarili novega ra�un, izberite <gui>Ustvari nov ra�un na strežniku</gui>. Ta zmožnost ni na voljo za vse vrste ra�unov in morda ne bo delovala z nekaterimi ponudniki ra�unov. Za ve� podrobnosti si oglejte <link xref=\"create-account\"/>. "
+#: 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 "Pošiljanje datotek je mogo�e samo z uporabo naslednjih storitev: <em>Jabber</em>, <em>Google Talk</em> in <em>Ljudje v bližini</em>."
 
-#: 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 "Vnesite zahtevane podatke. Za ve�ino ra�unov boste potrebovali le ID prijave in geslo. Nekateri ra�uni morda zahtevajo dodatne podrobnosti. Za ve� podrobnosti si oglejte <link xref=\"accounts-window#details\"/>."
+#: C/send-file.page:93(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."
+msgstr "Za pošiljanje datotek morate biti povezani na medmrežje ali krajevno omrežje."
 
-#: 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 "Za spremembo imena, ki identificira ra�un v oknu <gui>Ra�uni</gui>, izberite ra�un s seznama na levi ali kliknite na ime ali pritisnite preslednico. Uredite ime ra�una in pritisnite <key>Enter</key>, ko ste kon�ali."
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Pošljite sporo�ilo enemu od vaših stikov."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Dodajanje, spreminjanje in brisanje ra�unov."
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Pošiljanje sporo�ila nekomu"
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Okno ra�unov"
+#: C/send-message.page:36(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."
+msgstr "V <gui>Seznamu stikov</gui> dvokliknite ime stika s katerim želite imeti pogovor."
 
-#: C/accounts-window.page:35(p)
-msgid "The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
-msgstr "Okno <gui>Ra�uni</gui> vam omogo�a dodajanje, spreminjanje in brisanje ra�unov."
+#: 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 "Odprlo se bo novo okno. Vpišite sporo�ilo v polje na dnu okna in pritisnite <key>Enter</key> za pošiljanje."
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Podrobnosti ra�una"
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Pošiljanje sporo�ila meta-stiku"
 
-#: C/accounts-window.page:44(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 "Za ve�ino vrst ra�unov lahko enostavno vnesete ID prijave in geslo. Nekateri ra�uni ali vrste ra�unov morda zahtevajo dodatne podatke."
+#: C/send-message.page:58(item/p)
+msgid "Select the contact you want to have the conversation, and from the menu select <gui style=\"menuitem\">Chat</gui>."
+msgstr "Izberite ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Napredne možnosti za ra�une Jabber in Google Talk. "
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Dodajanje, urejanje ali brisanje osebnih sporo�il za vaša stanja."
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Podrobnosti ra�una Jabber"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/account-jabber.page:31(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\"/>."
-msgstr "Ve�ina ra�unov Jabber bo za povezavo zahtevala le ID prijave in geslo. Za nekatere ra�una na nekaterih vrstah omrežij boste morda morali vnesti dodatne podatke v odsek <gui>Napredno</gui>. Obi�ajno vam naprednih možnosti spodaj ne bo treba uporabljati. Za splošna navodila o dodajanju ra�una si oglejte <link xref=\"add-account\" />."
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "Nastavitev sporo�ila po meri"
 
-#: 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 je vrsta ra�una Jabber. Ta navodila veljajo tudi za ra�una Google Talk."
+#: C/set-custom-status.page:36(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."
+msgstr "V�asih si morda želite nastaviti sporo�ilo po meri za vaše stanje, na primer da ljudem sporo�ite da dolo�en �as ne boste na voljo."
 
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Zahtevano Å¡ifriranje (TLS/SSL)"
+#: C/set-custom-status.page:40(page/p)
+msgid "It is possible to set a custom message based on the different statuses available."
+msgstr "Sporo�ilo po meri je mogo�e nastaviti na osnovi razli�nih razpoložljivih stanj."
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Prezri napake potrdila SSL"
+#: C/set-custom-status.page:46(item/p)
+#: C/set-custom-status.page:82(item/p)
+msgid "From the <gui>Contact List</gui> window, click on the drop-down list at the top."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite na spustni seznam na vrhu."
 
-#: C/account-jabber.page:47(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."
-msgstr "Kadar je mogo�e je sporazumevanje med <app>Empathy</app> in strežnikom Jabber šifrirana. V primeru da šifrirana komunikacija ni mogo�a, morda morda sporo�ila poslana nešifrirano. Izberite <gui>Zahtevano šifriranj</gui> za prepre�itev komunikacije <app>Empathy</app> s strežniki Jabber, ko šifriranje ni mogo�e."
+#: C/set-custom-status.page:52(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>."
+msgstr "Izberite stanje, kateremu želite dodati sporo�ilu po meri. Izbrati morate sporo�ilo z oznako <gui>Sporo�ilo po meri</gui>."
 
-#: C/account-jabber.page:52(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 "Nekateri strežniki Jabber lahko šifrirajo podatke z neveljavnimi potrdili ali s potrdili neznanih overiteljev potrdil. V primeru da strežniku na katerega se povezujete zaupate, izberite <gui>Prezri napake potrdil SSL</gui> za omogo�itev šifriranja sporazumevanja z neveljavnimi potrdili."
+#: 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 "V besedilno polje na vrhu okna vnesite sporo�ilo po meri in pritisnite <key>Enter</key> za nastavitev sporo�ila. "
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Vir"
+#: 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 "V primeru da želite nastaviti sporo�ilo po meri kot priljubljeno in ga shraniti za ponovno uporabo, kliknite na majhno zvezdico na desni besedilnega polja, kjer ste napisali sporo�ilo po meri."
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prednost"
+#: C/set-custom-status.page:69(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."
+msgstr "V primeru da tega ne storite sporo�ilo ne bo na voljo, ko naslednji� uporabite <app>Empathy</app>. Shranjeno bo le za trenutno sejo."
 
-#: C/account-jabber.page:61(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."
-msgstr "V primeru da je z vašim ra�uni hkrati povezanih ve� programov (na primer na lo�enih ra�unalnikih) lahko nastavite vir za edinstveno identifikacijo vsakega. Privzeto bo <app>Empathy</app> kot vir uporabil <input>Telepathy</input>."
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "Urejanje, odstranjevanje in dodajanje sporo�ila po meri"
 
-#: 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."
-msgstr "Nastavite lahko prednost za navedbo kateri programi naj prejmejo dohodna sporo�ila od vaših stikov. Nova sporo�ila bodo poslana programu z najvišjo prednostjo."
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Izberite <gui>Uredi sporo�ilo po meri</gui>."
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Prepiši nastavitve strežnika"
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Za urejanje sporo�ila po meri:"
 
-#: C/account-jabber.page:71(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> bo uporabljal privzete nastavitve za povezovanje s strežnikom Jabber na osnovi vašega ID-ja prijave. Za nekatere strežnike Jabber boste morali ro�no vnesti nastavitve strežnika po meri. Te nastavitve bi vam moral dati vaš ponudnik Jabber."
+#: C/set-custom-status.page:100(item/p)
+msgid "From the <gui>Saved Presets</gui> box, select the status message you want to edit and double-click on it."
+msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporo�ilo stanja, ki ga želite uredi, in ga dvokliknite."
 
-#. 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:106(item/p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr "Vnesite novo sporo�ilo po meri in pritisnite <key>Enter</key> za njegovo spremembo."
 
-#. 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 "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Za odstranitev sporo�ila po meri:"
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Dodatni podatki, potrebni za povezovanje z omrežji IRC."
+#: C/set-custom-status.page:118(item/p)
+msgid "From the <gui>Saved Presets</gui> box, select the status message you want to remove."
+msgstr "V polju <gui>Shranjene prednastavljene</gui> izberite sporo�ilo stanja, ki ga želite odstraniti."
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Podrobnosti ra�una IRC"
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Kliknite na gumb <gui>Odstrani</gui>."
 
-#: 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 "Ra�uni IRC zahtevajo druga�ne podatke kot veliko drugih vrst ra�unov. Za ustvarjanje ra�una IRC morate navesti vsaj omrežje IRC in vzdevek. Ta stran vsebuje podrobnosti, ki jih lahko navedete za vaš ra�un IRC."
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Ko ste kon�ali kliknite na <gui>Zapri</gui>."
 
-#: C/account-irc.page:45(gui)
-#: C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Omrežje"
+#: 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 "Ko urejate ali dodajate novo sporo�ilo po meri, ne bo nastavljeno kot trenutno sporo�ilo stanja. Morali ga boste izbrati v oknu <gui>Seznam stikov</gui>."
 
-#: C/account-irc.page:46(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."
-msgstr "IRC je odprt sistem, ki ljudem omogo�a poganjanje lo�enih omrežij IRC. Vsako omrežje je lo�eno in ima svoje uporabnike in klepetalnice. <app>Empathy</app> v spustnemu seznamu <gui>Omrežje</gui> vsebuje najbolj priljubljena omrežja. Dodate lahko dodatna omrežja. Oglejte si <link xref=\"#networks\"/> spodaj."
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Dajte namizje v souporabo s svojimi stiki."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Vzdevek"
+#: C/share-desktop.page:18(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#: C/account-irc.page:54(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."
-msgstr "Vaš vzdevek je vaše edinstveno ime na omrežju IRC. Le ena oseba na omrežju lahko uporablja dani vzdevek. V primeru da dobite sporo�ilo napake <link xref=\"prob-conn-name\" role=\"error-msg\"/> boste morali spremeniti svoj vzdevek."
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "Dajte vaše namizje v souporabo"
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Geslo"
+#: C/share-desktop.page:35(page/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 "Z nekaterimi stiki je mogo�e dati svoje namizje v souporabo ali za�eti uporabljati njihovo namizje. To zmožnost lahko uporabljate za prikaz svojega namizja vašim stikom, za iskanje pomo�i ali za pomo� svojim stikom pri odpravljanju težav."
 
-#: C/account-irc.page:61(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."
-msgstr "Nekateri strežniki, še posebno tisti na zasebnih omrežjih zahtevajo geslo za povezavo. V primeru da ste overjeni za uporabo omrežja, vam bodo skrbniki omrežja priskrbeli geslo. "
+#: C/share-desktop.page:42(note/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 "Za zmožnost souporabe namizja boste morali imeti nameš�en strežnik VNC z ustrezno podporo. <app>Vino</app>, GNOME strežnik VNC ima zahtevano podporo."
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Gelsa NickServ"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "V oknu <gui>Seznam stikov</gui> izvedite eno od naslednjega:"
 
-#: C/account-irc.page:66(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."
-msgstr "Na nekaterih omrežjih je vzdevke mogo�e ustvariti z uporabo storitve NickServ. <app>Empathy</app> gesel vzdevkov ne podpira neposredno. Na nekaterih omrežjih, vklju�no s priljubljenim omrežjem FreeNode, so strežniška gesla samodejno posredovana NickServ, kar vam omogo�a nastavitev tega polja za identifikacijo z NickServ. Za ve� podrobnosti si oglejte <link xref=\"irc-nick-password\"/>."
+#: 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>."
+msgstr "Izberite stik kateremu želite dati svoje namizje v souporabo in izberite  <guiseq><gui>Uredi</gui><gui>Stik</gui><gui>Daj moje namizje v souporabo</gui></guiseq>."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Resni�no ime"
+#: 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 "Desno kliknite na ime stika kateremu želite dati namizje v souporabo in izberite <gui>Daj moje namizje v souporabo</gui>."
 
-#: C/account-irc.page:77(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."
-msgstr "Poleg vašega vzdevka lahko navedete tudi svoje pravo ime. Ostali uporabniki ga bodo lahko videli, ko si ogledajo vaše podrobnosti."
+#: C/share-desktop.page:71(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."
+msgstr "Povabilo za ogled vašega namizja bo bilo poslano izbranemu stiku. Za ogled vašega namizja ga bo moral sprejeti."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Kon�aj sporo�ilo"
+#: C/share-desktop.page:77(item/p)
+msgid "You can disconnect the contact from your computer using your desktop sharing application."
+msgstr "Povezavo stika s svojim oddaljenim namizjem lahko prekinete s programom souporabe namizja."
 
-#: C/account-irc.page:82(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 "Ko prekinete povezavo, je sporo�ilo kon�anja poslano vsem klepetalnicam, v katerih ste in vsem uporabnikom s katerimi imate zasebni pogovor. Uporabite to polje za sporo�ilo kon�anja po meri."
+#: C/share-desktop.page:82(note/p)
+msgid "For more information about how to use the remote desktop sharing application, refer to its help."
+msgstr "Za ve� podrobnosti kako uporabiti program oddaljenega pregledovalnika namizja se sklicujte na pomo�."
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "Omrežja IRC"
+#: 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 "Ko svoje namizje date v souporabo z nekom drugim, boste morda opazili upo�asnjeno delovanje sistema in nizko hitrost medmrežja."
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Omrežja"
+#: C/share-desktop.page:96(note/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 "Vsi stiki morda ne podpirajo te zmožnosti. Stiki morajo imeti vsaj <app>Empathy</app> razli�ico 2.28 in na svojemu sistemu nameš�en program pregledovalnika oddaljenega namizja."
 
-#: C/account-irc.page:99(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."
-msgstr "<app>Empathy</app> vklju�uje seznam priljubljenih omrežij IRC. V primeru da želite uporabljati drugo omrežje IRC ga lahko dodate na seznam. Omrežja lahko tudi spreminjate in jih odstranjujete s seznama. You can also modify networks and remove them from the list."
+#. 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 "external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr "external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+
+#. 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 "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)
+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)
+msgctxt "_"
+msgid "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: 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 "Za dodajanje omrežja na seznamu kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Dodaj</media>."
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Razumevanje razli�nih stanj in ikon stanja."
 
-#: 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>."
-msgstr "Za spremembo omrežja v seznamu izberite omrežje in kliknite <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Uredi</media>."
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "Vrste stanj in ikone"
 
-#: 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 "Za odstranitev omrežja s seznama izberite omrežje in kliknite  <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">Odstrani</media>."
+#: C/status-icons.page:39(item/title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Available icon</media> <gui>Available</gui>"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Ikona na voljo</media> <gui>Na voljo</gui>"
 
-#: C/account-irc.page:115(p)
-msgid "When adding or modifying a network, you can enter the following information:"
-msgstr "Ob dodajanju ali spreminjanju omrežja lahko vnesete naslednje podatke:"
+#: C/status-icons.page:41(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."
+msgstr "Stanje <em>Na voljo</em> uporabite, ko ste za ra�unalnikom in zmožni klepetati s svojimi stiki. Za to stanje lahko nastavite sporo�ilo po meri."
 
-#: C/account-irc.page:121(p)
-msgid "This is the name of the network as you want it to appear in the list of networks."
-msgstr "To je ime omrežja, ki se bo pojavilo v seznamu omrežij."
+#: C/status-icons.page:45(item/title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</media> <gui>Busy</gui>"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Ikona zaposleno</media> <gui>Zaposleno</gui>"
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Nabor znakov"
+#: C/status-icons.page:47(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."
+msgstr "Uporabite stanje <em>Zaposlen</em> da bodo vaši stiki vedeli, da trenutno ne želite klepetati. Še vedno lahko vzpostavijo stik z vami, na primer �e želijo razpravljati o ne�em nujnem. Privzeto <app>Empathy</app> ne uporablja zvokov in balonskih opomnikov, ko ste zaposleni. Za to stanje lahko nastavite sporo�ilo po meri."
 
-#: C/account-irc.page:126(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."
-msgstr "To navede znakovno kodiranje, ki je obi�ajno uporabljano na temu omrežju. Znakovno kodiranje je dolo�en na�in notranjega zapisovanja znakov v ra�unalniku. Obstaja ve� znakovnih kodiranj. Za pravilen ogled sporo�il drugih uporabnikov morate uporabljati isto znakovno kodiranje kot oni."
+#: C/status-icons.page:53(item/title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</media> <gui>Away</gui>"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Ikona odsotno</media> <gui>Odsotno</gui>"
 
-#. Translators: Recommend character encodings that are common
-#. for your language.
-#: C/account-irc.page:135(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."
-msgstr "Privzeto <app>Empathy</app> uporablja UTF-8, priljubljeno znakovno kodiranje, ki lahko upravlja z ve�ino svetovnih jezikov. Drugo pogosto kodiranje za slovenš�ino in nekatere druge srednjeevropske jezike je ISO-8859-2."
+#: C/status-icons.page:55(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."
+msgstr "Stanje <em>Odsoten</em> uporabite, ko greste pro� od ra�unalnika. <app>Empathy</app> vaše stanje samodejno nastavi na odsoten, �e ra�unalnika nekaj �asa ne uporabljate ali �e je vklopljen vaš ohranjevalnik zaslona. Privzeto <app>Empathy</app> ne bo uporabljal zvokov in obvestilnih balon�kov, ko ste odsotni. Za to stanje lahko nastavite sporo�ilo po meri."
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Strežniki"
+#: C/status-icons.page:62(item/title)
+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\">Ikona nepovezano</media> <gui>Nevidno</gui>"
 
-#: C/account-irc.page:142(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."
-msgstr "Omrežje IRC ima lahko veliko strežnikov na katere se lahko povežete. Ko ste povezani na strežnik na dolo�enemu omrežju se lahko sporazumevate z vsemi uporabniki na vseh ostalih strežnikih na temu omrežju. Omrežju lahko dodate ali odstranite strežnike z uporabo gumbov <gui>Dodaj</gui> in <gui>Odstrani</gui>."
+#: 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 "Ko nastavite svoje stanje na <em>Nevidno</em>, boste za vaše stike videti nepovezani. Še vedno boste povezani s svojimi ra�uni in še vedno boste videli stanja svojih stikov in lahko za�eli pogovore z njimi. "
 
-#: 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."
-msgstr "Ko je strežnik izbran za urejanje kliknite na <gui>Strežnik</gui> ali <gui>Vrata</gui>. Namesto tega lahko uporabite puš�ici levo in desno za žariš�enje na polje in pritisnite preslednico za za�etek urejanja."
+#: C/status-icons.page:69(item/title)
+msgid "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline icon</media> <gui>Offline</gui>"
+msgstr "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Ikona nepovezano</media> <gui>Nepovezano</gui>"
 
-#: C/account-irc.page:151(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 "Izberite izbirno polje v stolpcu <gui>SSL</gui> za šifriranje vse komunikacije s strežnikom. Vedite da to ostalim uporabnikom na omrežju ne prepre�uje ogleda vnosov, ki ste jih napisali v javne klepetalnice."
+#: C/status-icons.page:71(item/p)
+msgid "Setting your status to <em>Offline</em> disconnects you from all of your accounts."
+msgstr "Nastavitev vašega stanja na <em>Nepovezano</em> prekine povezavo z vsemi vašimi ra�uni."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-msgstr "Andrej Žnidarši� <andrej.znidarsic@gmail.com>, 2010"
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Za�nite video pogovor z enim od vaših stikov"
+
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "Za�enjanje video konference"
+
+#: C/video-call.page:31(page/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 "V primeru da imate spletno kamero, lahko svoje stike pokli�ite in imate z njimi video pogovor. Ta zmožnost deluje le z dolo�enimi vrstami ra�unov in zahteva, da ima druga oseba program, ki podpira video klice."
+
+#: C/video-call.page:38(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\">Video Call</gui>."
+msgstr "V oknu <gui>Seznam stikov</gui> kliknite ikono <media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">video klic</media> poleg imena stika, ki ga želite poklicati, in izberite <gui style=\"menuitem\">Video klic</gui>. Namesto tega lahko desno kliknete na stik in izberete <gui style=\"menuitem\">Video klic</gui>. "
+
+#: C/video-call.page:55(note/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 "Za pretvorbo video pogovora v zvo�ni pogovor izberite <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Izklopi</gui></guiseq>."
+
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Za�nite video pogovor z enim od svojih meta-stikov"
+
+#: 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 "Desno kliknite na ime stika s katerim želite imeti pogovor in izberite <gui style=\"menuitem\">Klepet</gui>."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "Ikona stanja na voljo"
+
+#~ msgid "Available"
+#~ msgstr "Na voljo"
+
+#~ msgid "Busy icon"
+#~ msgstr "Ikona zasedenosti"
+
+#~ msgid "Busy"
+#~ msgstr "Zaseden"
+
+#~ msgid "Away icon"
+#~ msgstr "Ikona odsotnosti"
+
+#~ msgid "Away"
+#~ msgstr "Odsoten"
+
+#~ msgid "Offline icon"
+#~ msgstr "Ikona nepovezanosti"
+
+#~ msgid "Invisible"
+#~ msgstr "Neviden"
+
+#~ msgid "Offline"
+#~ msgstr "Nepovezano"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "Urejanje, odstranjevanje in dodajanje sporo�ila po meri"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr ""
+#~ "Za dodajanje novega sporo�ila po meri iz odseka <gui>Dodajanje nove "
+#~ "prednastavljene</gui>:"
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr ""
+#~ "Kliknite na spustni seznam za izbiro stanja kateremu želite nastaviti "
+#~ "sporo�ilo po meri. "
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr "Kliknite na besedilno polje in vpišite novo sporo�ilo po meri."
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr ""
+#~ "Kliknite na <gui>Dodaj</gui> za dodajanje novega sporo�ila k "
+#~ "prednastavljenim."
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
+
+#, fuzzy
+#~ msgid "I'd like to see this played up a bit more."
+#~ msgstr "?"
+
+#~ 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 vam ne dovoli ustvarjanje ra�una IRC brez veljavnega vzdevka. "
+#~ "Povezava vodi�a je bila odstranjena. Odstrani besedilo."
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "Namesite telepathy-idle"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "Ikona za zvo�ni pogovor"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "Ikona za video pogovor"
+
+#~ 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 ""
+#~ "Želim narediti razporeditve kot je ta z uporabo Ne in ✔ za Ja, toda "
+#~ "potrebno je pogledati vpliv na dostopnost. Za mnenje sem <link href="
+#~ "\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006."
+#~ "html\">vprašal ekipo dostopnosti</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 ""
+#~ "Nedavno delo na telepathy-butterfly in papayon podpira zvok in video za "
+#~ "MSN. Morda bo podpora izšla v 2.28, toda ker ne sledi razporeditvi izdaje "
+#~ "Gnome, ni mogo�e biti prepri�an. V primeru da je videti, kot da bo "
+#~ "podpora izšla, jo bom ozna�il z Da."
+
+#~ msgid "Resource"
+#~ msgstr "Vir"
+
+#~ msgid "Priority"
+#~ msgstr "Prednost"
+
+#~ msgid "Network"
+#~ msgstr "Omrežje"
+
+#~ msgid "Nickname"
+#~ msgstr "Vzdevek"
+
+#~ msgid "Password"
+#~ msgstr "Geslo"
+
+#~ msgid "Quit message"
+#~ msgstr "Kon�aj sporo�ilo"
+
+#~ msgid "Charset"
+#~ msgstr "Nabor znakov"
+
+#~ msgid "Servers"
+#~ msgstr "Strežniki"
 
 #~ msgid ""
 #~ "In order to be able to share your desktop or to remotely use your "
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index f511d46a4..32426a934 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		\
@@ -56,7 +56,6 @@ libempathy_gtk_handwritten_source =            	\
 	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 +66,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 +112,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		\
@@ -126,7 +123,6 @@ libempathy_gtk_headers =			\
 	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 +133,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 +182,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 0de4dc80f..7530914fc 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -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 ();
 
@@ -1879,7 +1881,7 @@ do_constructed (GObject *obj)
     { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
         account_widget_build_salut },
     WIDGET (gabble, jabber),
-    WIDGET (butterfly, msn),
+    WIDGET (haze, msn),
     WIDGET (haze, icq),
     WIDGET (haze, aim),
     WIDGET (haze, yahoo),
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-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 16526d354..545ec7ce8 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -27,8 +27,6 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include "empathy-call-utils.h"
 
 #include <libempathy/empathy-gsettings.h>
@@ -85,14 +83,14 @@ empathy_call_create_call_request (const gchar *contact,
 {
   return tp_asv_new (
     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-      TPY_IFACE_CHANNEL_TYPE_CALL,
+      TP_IFACE_CHANNEL_TYPE_CALL,
     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
       TP_HANDLE_TYPE_CONTACT,
     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING,
       contact,
-    TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
+    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
       initial_audio,
-    TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
+    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
       initial_video,
     NULL);
 }
@@ -134,7 +132,6 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
-#ifdef HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -146,24 +143,24 @@ create_call_channel_cb (GObject *source,
   if (tp_account_channel_request_create_channel_finish (
       TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
     {
-      g_object_unref (streamed_media_req);
+      g_clear_object (&streamed_media_req);
       return;
     }
 
   DEBUG ("Failed to create Call channel: %s", error->message);
 
-  if (error->code != TP_ERROR_NOT_IMPLEMENTED)
+  if (streamed_media_req != NULL)
     {
-      show_call_error (error);
+      DEBUG ("Let's try with an StreamedMedia channel");
+      g_error_free (error);
+      tp_account_channel_request_create_channel_async (streamed_media_req,
+          EMPATHY_AV_BUS_NAME, NULL,
+          create_streamed_media_channel_cb,
+          NULL);
       return;
     }
 
-  DEBUG ("Let's try with an StreamedMedia channel");
-  g_error_free (error);
-  tp_account_channel_request_create_channel_async (streamed_media_req,
-      EMPATHY_AV_BUS_NAME, NULL,
-      create_streamed_media_channel_cb,
-      NULL);
+  show_call_error (error);
 }
 
 /* Try to request a Call channel and fallback to StreamedMedia if that fails */
@@ -174,8 +171,11 @@ call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-  GHashTable *call_request, *streamed_media_request;
-  TpAccountChannelRequest *call_req, *streamed_media_req;
+  GHashTable *call_request;
+  TpAccountChannelRequest *call_req, *streamed_media_req = NULL;
+#ifdef HAVE_EMPATHY_AV
+  GHashTable *streamed_media_request;
+#endif
 
   /* Call */
   call_request = empathy_call_create_call_request (contact,
@@ -186,6 +186,7 @@ call_new_with_streams (const gchar *contact,
 
   g_hash_table_unref (call_request);
 
+#ifdef HAVE_EMPATHY_AV
   /* StreamedMedia */
   streamed_media_request = empathy_call_create_streamed_media_request (
       contact, initial_audio, initial_video);
@@ -195,44 +196,14 @@ call_new_with_streams (const gchar *contact,
       timestamp);
 
   g_hash_table_unref (streamed_media_request);
+#endif
 
   tp_account_channel_request_create_channel_async (call_req,
-      EMPATHY_CALL_BUS_NAME, NULL,
-      create_call_channel_cb,
-      streamed_media_req);
+      EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, streamed_media_req);
 
   g_object_unref (call_req);
 }
 
-#else /* HAVE_CALL */
-
-static void
-sm_new_with_streams (const gchar *contact,
-    TpAccount *account,
-    gboolean initial_audio,
-    gboolean initial_video,
-    gint64 timestamp)
-{
-  GHashTable *streamed_media_request;
-  TpAccountChannelRequest *streamed_media_req;
-
-  /* StreamedMedia */
-  streamed_media_request = empathy_call_create_streamed_media_request (
-      contact, initial_audio, initial_video);
-
-  streamed_media_req = tp_account_channel_request_new (account,
-      streamed_media_request,
-      timestamp);
-
-  g_hash_table_unref (streamed_media_request);
-
-  tp_account_channel_request_create_channel_async (streamed_media_req,
-      EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL);
-
-  g_object_unref (streamed_media_req);
-}
-#endif /* HAVE_CALL */
-
 void
 empathy_call_new_with_streams (const gchar *contact,
     TpAccount *account,
@@ -240,13 +211,8 @@ empathy_call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-#ifdef HAVE_CALL
   call_new_with_streams (contact, account, initial_audio, initial_video,
       timestamp);
-#else
-  sm_new_with_streams (contact, account, initial_audio, initial_video,
-      timestamp);
-#endif
 }
 
 void
@@ -283,3 +249,85 @@ empathy_call_set_stream_properties (GstElement *element,
 
   g_object_unref (gsettings_call);
 }
+
+/* Copied from telepathy-yell call-channel.c */
+void
+empathy_call_channel_send_video (TpCallChannel *self,
+    gboolean send)
+{
+  GPtrArray *contents;
+  gboolean found = FALSE;
+  guint i;
+
+  g_return_if_fail (TP_IS_CALL_CHANNEL (self));
+
+  /* Loop over all the contents, if some of them a video set all their
+   * streams to sending, otherwise request a video channel in case we want to
+   * sent */
+  contents = tp_call_channel_get_contents (self);
+  for (i = 0 ; i < contents->len ; i++)
+    {
+      TpCallContent *content = g_ptr_array_index (contents, i);
+
+      if (tp_call_content_get_media_type (content) ==
+              TP_MEDIA_STREAM_TYPE_VIDEO)
+        {
+          GPtrArray *streams;
+          guint j;
+
+          found = TRUE;
+          streams = tp_call_content_get_streams (content);
+          for (j = 0; j < streams->len; j++)
+            {
+              TpCallStream *stream = g_ptr_array_index (streams, j);
+
+              tp_call_stream_set_sending_async (stream, send, NULL, NULL);
+            }
+        }
+    }
+
+  if (send && !found)
+    {
+      tp_call_channel_add_content_async (self, "video",
+          TP_MEDIA_STREAM_TYPE_VIDEO, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL,
+          NULL, NULL);
+    }
+}
+
+/* Copied from telepathy-yell call-channel.c */
+TpSendingState
+empathy_call_channel_get_video_state (TpCallChannel *self)
+{
+  TpSendingState result = TP_SENDING_STATE_NONE;
+  GPtrArray *contents;
+  guint i;
+
+  g_return_val_if_fail (TP_IS_CALL_CHANNEL (self), TP_SENDING_STATE_NONE);
+
+  contents = tp_call_channel_get_contents (self);
+  for (i = 0 ; i < contents->len ; i++)
+    {
+      TpCallContent *content = g_ptr_array_index (contents, i);
+
+      if (tp_call_content_get_media_type (content) ==
+              TP_MEDIA_STREAM_TYPE_VIDEO)
+        {
+          GPtrArray *streams;
+          guint j;
+
+          streams = tp_call_content_get_streams (content);
+          for (j = 0; j < streams->len; j++)
+            {
+              TpCallStream *stream = g_ptr_array_index (streams, j);
+              TpSendingState state;
+
+              state = tp_call_stream_get_local_sending_state (stream);
+              if (state != TP_SENDING_STATE_PENDING_STOP_SENDING &&
+                  state > result)
+                result = state;
+            }
+        }
+    }
+
+  return result;
+}
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 836103100..99e4ecf91 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -43,6 +43,11 @@ GHashTable * empathy_call_create_streamed_media_request (const gchar *contact,
 void empathy_call_set_stream_properties (GstElement *element,
     gboolean echo_cancellation);
 
+TpSendingState empathy_call_channel_get_video_state (TpCallChannel *self);
+void empathy_call_channel_send_video (TpCallChannel *self,
+    gboolean send);
+
+
 G_END_DECLS
 
 #endif /*  __EMPATHY_CALL_UTILS_H__ */
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index c251f1f42..6bef4781e 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -414,7 +414,7 @@ chat_text_view_append_timestamp (EmpathyChatTextView *view,
 	if (show_date) {
 		/* Translators: timestamp displayed between conversations in
 		 * chat windows (strftime format string) */
-		tmp = empathy_time_to_string_utc (timestamp, _("%A %B %d %Y"));
+		tmp = empathy_time_to_string_local (timestamp, _("%A %B %d %Y"));
 		g_string_append (str, tmp);
 		g_string_append (str, ", ");
 		g_free (tmp);
@@ -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..b98f52102 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,11 +26,12 @@
  */
 
 #include <config.h>
+/* for GCompletion */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
 #include <string.h>
 #include <stdlib.h>
 
-#undef G_DISABLE_DEPRECATED /* for GCompletion */
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
@@ -73,6 +74,7 @@ struct _EmpathyChatPriv {
 	gchar             *id;
 	gchar             *name;
 	gchar             *subject;
+	EmpathyContact    *self_contact;
 	EmpathyContact    *remote_contact;
 	gboolean           show_contacts;
 
@@ -155,6 +157,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 +378,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 +398,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 +920,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 +1405,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 +1502,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 +1713,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 +2611,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 +2918,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 +3298,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 +3311,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 +3330,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 +3454,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 +3470,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 +4036,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 +4060,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 +4170,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 +4333,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 +4371,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-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index eee88aa50..415aee0b2 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -27,8 +27,6 @@
 
 #include <libempathy/empathy-utils.h>
 
-#include <libempathy/empathy-tp-contact-list.h>
-
 #include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index ccdd5fa63..01e4b6a83 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -9,6 +9,8 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <folks/folks-telepathy.h>
 
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 509df53e8..b352ee124 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -101,6 +101,7 @@ typedef struct
   GtkWidget *grid_contact;
   GtkWidget *vbox_avatar;
   GtkWidget *favourite_checkbox;
+  GtkWidget *label_details;
 
   /* Location */
   GtkWidget *vbox_location;
@@ -1439,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
     {
@@ -1755,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 39223aedf..a8d9fbe7a 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -144,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-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..22d314882 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,12 +49,11 @@
 #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"
+#include "empathy-individual-information-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -70,13 +72,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 +84,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 +138,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 +268,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 +766,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 +781,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 +926,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 +1255,134 @@ 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)
 {
-  empathy_individual_information_dialog_show (individual, NULL);
+  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)
+{
+  EmpathyIndividualManager *mgr;
+
+  mgr = empathy_individual_manager_dup_singleton ();
+
+  /* Only use gnome-contacts if that's a 'real' individual we got from
+   * Folks (and so the individual manager knows about it). If not that's a
+   * MUC contact and we use the simple dialog. */
+  if (empathy_individual_manager_lookup_member (mgr,
+        folks_individual_get_id (individual)) != NULL)
+    {
+      start_gnome_contacts (individual, TRUE);
+    }
+  else
+    {
+      empathy_individual_information_dialog_show (individual, NULL);
+    }
+
+  g_object_unref (mgr);
 }
 
 static GtkWidget *
@@ -1313,7 +1401,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 +1459,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-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index 288d9e379..f8610cf16 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -76,15 +76,19 @@ individual_store_manager_members_changed_cb (EmpathyIndividualManager *manager,
 
   for (l = removed; l; l = l->next)
     {
-      DEBUG ("Individual %s %s",
-          folks_individual_get_id (l->data), "removed");
+      DEBUG ("Individual %s (%s) %s",
+          folks_individual_get_id (l->data),
+          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (l->data)),
+          "removed");
 
       individual_store_remove_individual_and_disconnect (store, l->data);
     }
 
   for (l = added; l; l = l->next)
     {
-      DEBUG ("Individual %s %s", folks_individual_get_id (l->data), "added");
+      DEBUG ("Individual %s (%s) %s", folks_individual_get_id (l->data),
+          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (l->data)),
+          "added");
 
       individual_store_add_individual_and_connect (store, l->data);
     }
@@ -99,8 +103,9 @@ individual_store_manager_groups_changed_cb (EmpathyIndividualManager *manager,
 {
   EmpathyIndividualStore *store = EMPATHY_INDIVIDUAL_STORE (self);
 
-  DEBUG ("Updating groups for individual %s",
-      folks_individual_get_id (individual));
+  DEBUG ("Updating groups for individual %s (%s)",
+      folks_individual_get_id (individual),
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
 
   /* We do this to make sure the groups are correct, if not, we
    * would have to check the groups already set up for each
@@ -163,8 +168,9 @@ individual_store_manager_member_renamed_cb (EmpathyIndividualManager *manager,
 {
   EmpathyIndividualStore *store = EMPATHY_INDIVIDUAL_STORE (self);
 
-  DEBUG ("Individual %s renamed to %s",
+  DEBUG ("Individual %s (%s) renamed to %s",
       folks_individual_get_id (old_individual),
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (old_individual)),
       folks_individual_get_id (new_individual));
 
   /* remove old contact */
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index aa3f6334d..f27aad95c 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)
     {
-      GtkTreeIter iter_group, *parent;
+      /* 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
+    {
+      /* 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);
-        }
-      else
-        {
-          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);
+          grouped = 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);
 }
 
@@ -441,8 +447,6 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
           EMPATHY_INDIVIDUAL_STORE_COL_IS_ACTIVE, active,
           -1);
 
-      DEBUG ("Set item %s", active ? "active" : "inactive");
-
       if (set_changed)
         {
           path = gtk_tree_model_get_path (model, l->data);
@@ -481,10 +485,6 @@ individual_store_contact_active_new (EmpathyIndividualStore *self,
 {
   ShowActiveData *data;
 
-  DEBUG ("Individual'%s' now active, and %s be removed",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)),
-      remove_ ? "WILL" : "WILL NOT");
-
   data = g_slice_new0 (ShowActiveData);
 
   /* We don't actually want to force either the IndividualStore or the
@@ -532,9 +532,6 @@ individual_store_contact_active_cb (ShowActiveData *data)
       empathy_individual_store_remove_individual (data->self, data->individual);
     }
 
-  DEBUG ("Individual'%s' no longer active",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->individual)));
-
   individual_store_contact_set_active (data->self,
       data->individual, FALSE, TRUE);
 
@@ -561,9 +558,15 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
 
   if (error != NULL)
     {
-      DEBUG ("failed to retrieve pixbuf for individual %s: %s",
-          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)),
-          error->message);
+      /* No need to display an error if the individal just doesn't have an
+       * avatar */
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+        {
+          DEBUG ("failed to retrieve pixbuf for individual %s: %s",
+              folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)),
+              error->message);
+        }
+
       g_clear_error (&error);
     }
   else if (data->store != NULL)
@@ -639,15 +642,10 @@ individual_store_contact_update (EmpathyIndividualStore *self,
       if (self->priv->show_active)
         {
           do_set_active = TRUE;
-
-          DEBUG ("Set active (individual added)");
         }
     }
   else
     {
-      DEBUG ("Individual'%s' in list:YES, should be:YES",
-          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
-
       /* Get online state before. */
       if (iters && g_list_length (iters) > 0)
         {
@@ -662,17 +660,12 @@ individual_store_contact_update (EmpathyIndividualStore *self,
             {
               do_set_active = TRUE;
               do_set_refresh = TRUE;
-
-              DEBUG ("Set active (individual 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 (individual updated)");
             }
         }
 
@@ -761,9 +754,6 @@ individual_store_individual_updated_cb (FolksIndividual *individual,
     GParamSpec *param,
     EmpathyIndividualStore *self)
 {
-  DEBUG ("Individual'%s' updated, checking roster is in sync...",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
-
   individual_store_contact_update (self, individual);
 }
 
@@ -774,9 +764,6 @@ individual_store_contact_updated_cb (EmpathyContact *contact,
 {
   FolksIndividual *individual;
 
-  DEBUG ("Contact '%s' updated, checking roster is in sync...",
-      empathy_contact_get_alias (contact));
-
   individual = g_object_get_data (G_OBJECT (contact), "individual");
   if (individual == NULL)
     return;
@@ -792,9 +779,6 @@ individual_personas_changed_cb (FolksIndividual *individual,
 {
   GeeIterator *iter;
 
-  DEBUG ("Individual '%s' personas-changed.",
-      folks_individual_get_id (individual));
-
   iter = gee_iterable_iterator (GEE_ITERABLE (removed));
   /* FIXME: libfolks hasn't grown capabilities support yet, so we have to go
    * through the EmpathyContacts for them. */
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index dad975b3c..54712d25a 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
@@ -1558,8 +1563,6 @@ individual_view_expand_idle_cb (EmpathyIndividualView *self)
 {
   EmpathyIndividualViewPriv *priv = GET_PRIV (self);
 
-  DEBUG ("individual_view_expand_idle_cb");
-
   g_signal_handlers_block_by_func (self,
     individual_view_row_expand_or_collapse_cb, GINT_TO_POINTER (TRUE));
   g_signal_handlers_block_by_func (self,
@@ -2531,19 +2534,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 +2608,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-log-window.c b/libempathy-gtk/empathy-log-window.c
index 51a47c7a3..13fdefbd5 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -34,8 +34,6 @@
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <telepathy-logger/telepathy-logger.h>
 #ifdef HAVE_CALL_LOGS
 # include <telepathy-logger/call-event.h>
@@ -873,7 +871,7 @@ maybe_refresh_logs (TpChannel *channel,
       !(event_mask & TPL_EVENT_MASK_TEXT))
     goto out;
   if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) ||
-       !tp_strdiff (type, TPY_IFACE_CHANNEL_TYPE_CALL)) &&
+       !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) &&
       !(event_mask & TPL_EVENT_MASK_CALL))
     goto out;
 
@@ -1015,7 +1013,7 @@ observe_channels (TpSimpleObserver *observer,
           tp_g_signal_connect_object (channel, "invalidated",
               G_CALLBACK (on_channel_ended), self, 0);
         }
-      else if (!tp_strdiff (type, TPY_IFACE_CHANNEL_TYPE_CALL) ||
+      else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL) ||
           !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
         {
           g_hash_table_insert (self->priv->channels,
@@ -1060,7 +1058,7 @@ log_window_create_observer (EmpathyLogWindow *self)
   tp_base_client_take_observer_filter (self->priv->observer,
       tp_asv_new (
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-            TPY_IFACE_CHANNEL_TYPE_CALL,
+            TP_IFACE_CHANNEL_TYPE_CALL,
           NULL));
 
   tp_base_client_register (self->priv->observer, NULL);
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 0fecedde5..ba44721d3 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -28,8 +28,6 @@
 
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-utils.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-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 216e4ffdb..7adacf472 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -184,6 +184,10 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
         /* Haze's SIP implementation is pretty useless (bgo #629736) */
         continue;
 
+      if (!tp_strdiff (cm->name, "butterfly"))
+        /* Butterfly isn't supported any more */
+        continue;
+
       if (tp_strdiff (cm->name, "haze") && !tp_strdiff (saved_cm_name, "haze"))
         {
           GtkTreeIter titer;
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index bc9e9218c..8f14fb6b1 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -18,6 +18,8 @@
  * Authors: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <gtk/gtk.h>
 
 #include <dbus/dbus-glib.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-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index f3761e5cd..6f86ccddd 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -64,6 +64,19 @@ empathy_gtk_init (void)
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   PKGDATADIR G_DIR_SEPARATOR_S "icons");
 
+	/* Add icons from source dir if available */
+	if (g_getenv ("EMPATHY_SRCDIR") != NULL) {
+		gchar *path;
+
+		path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "data",
+				"icons", "local-copy", NULL);
+		if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+			gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
+		}
+
+		g_free (path);
+	}
+
 	initialized = TRUE;
 }
 
@@ -719,8 +732,8 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
 	avatar_icon =
 		folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual));
 	if (avatar_icon == NULL) {
-		g_simple_async_result_set_error (result, TP_ERRORS,
-			TP_ERROR_INVALID_ARGUMENT, "no avatar found");
+		g_simple_async_result_set_error (result, G_IO_ERROR,
+			G_IO_ERROR_NOT_FOUND, "no avatar found");
 
 		g_simple_async_result_complete (result);
 		g_object_unref (result);
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index da37ef371..3d7e5fca7 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =                                           \
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
-	$(YELL_CFLAGS)					\
 	$(GEOCLUE_CFLAGS)				\
 	$(GEOCODE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
@@ -52,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		\
@@ -61,7 +61,6 @@ libempathy_headers =				\
 	empathy-tls-verifier.h			\
 	empathy-tp-chat.h			\
 	empathy-tp-contact-factory.h		\
-	empathy-tp-contact-list.h		\
 	empathy-tp-roomlist.h			\
 	empathy-tp-streamed-media.h		\
 	empathy-types.h				\
@@ -92,6 +91,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			\
@@ -101,7 +101,6 @@ libempathy_handwritten_source =				\
 	empathy-tls-verifier.c				\
 	empathy-tp-chat.c				\
 	empathy-tp-contact-factory.c			\
-	empathy-tp-contact-list.c			\
 	empathy-tp-roomlist.c				\
 	empathy-tp-streamed-media.c			\
 	empathy-utils.c
@@ -147,7 +146,6 @@ nodist_libempathy_la_SOURCES =\
 
 libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
-	$(top_builddir)/telepathy-yell/telepathy-yell/libtelepathy-yell.la \
 	$(GCR_LIBS) \
 	$(EMPATHY_LIBS) \
 	$(GEOCLUE_LIBS) \
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-client-factory.c b/libempathy/empathy-client-factory.c
index 294eaf5ff..2a8559441 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -26,42 +26,12 @@
 #include "empathy-tp-chat.h"
 #include "empathy-utils.h"
 
-#include <telepathy-yell/telepathy-yell.h>
-
 G_DEFINE_TYPE (EmpathyClientFactory, empathy_client_factory,
     TP_TYPE_AUTOMATIC_CLIENT_FACTORY)
 
 #define chainup ((TpSimpleClientFactoryClass *) \
     empathy_client_factory_parent_class)
 
-/* FIXME: move to yell */
-static TpyCallChannel *
-call_channel_new_with_factory (TpSimpleClientFactory *factory,
-    TpConnection *conn,
-    const gchar *object_path,
-    const GHashTable *immutable_properties,
-    GError **error)
-{
-  TpProxy *conn_proxy = (TpProxy *) conn;
-
-  g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
-  g_return_val_if_fail (object_path != NULL, NULL);
-  g_return_val_if_fail (immutable_properties != NULL, NULL);
-
-  if (!tp_dbus_check_valid_object_path (object_path, error))
-    return NULL;
-
-  return g_object_new (TPY_TYPE_CALL_CHANNEL,
-      "factory", factory,
-      "connection", conn,
-      "dbus-daemon", conn_proxy->dbus_daemon,
-      "bus-name", conn_proxy->bus_name,
-      "object-path", object_path,
-      "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
-      "channel-properties", immutable_properties,
-      NULL);
-}
-
 static TpChannel *
 empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
     TpConnection *conn,
@@ -83,11 +53,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
             TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path,
             properties));
     }
-  else if (!tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL))
-    {
-      return TP_CHANNEL (call_channel_new_with_factory (
-            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
-    }
 
   return chainup->create_channel (factory, conn, path, properties, error);
 }
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index a45731686..a39f3ae80 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.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>
@@ -229,7 +230,7 @@ empathy_connection_managers_listed_cb (TpConnectionManager * const *cms,
   for (iter = cms ; iter != NULL && *iter != NULL; iter++)
     {
       /* only list cms that didn't hit errors */
-      if (tp_connection_manager_is_ready (*iter))
+      if (tp_proxy_is_prepared (*iter, TP_CONNECTION_MANAGER_FEATURE_CORE))
         priv->cms = g_list_prepend (priv->cms, g_object_ref (*iter));
     }
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index c947fad62..b8d2f3c40 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -28,7 +28,6 @@
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
-#include <telepathy-yell/telepathy-yell.h>
 
 #include <telepathy-logger/log-manager.h>
 
@@ -1741,8 +1740,7 @@ tp_caps_to_capabilities (TpCapabilities *caps)
           if (!tp_strdiff (service, "rfb"))
             capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE;
         }
-      else if (!tp_strdiff (chan_type,
-        TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
+      else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
         {
           guint j;
 
@@ -1769,26 +1767,25 @@ tp_caps_to_capabilities (TpCapabilities *caps)
                 TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL, NULL))
             capabilities |= EMPATHY_CAPABILITIES_SMS;
         }
-      else if (!tp_strdiff (chan_type,
-        TPY_IFACE_CHANNEL_TYPE_CALL))
+      else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL))
         {
           guint j;
 
           if (tp_asv_get_boolean (fixed_prop,
-              TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
+              TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
             capabilities |= EMPATHY_CAPABILITIES_AUDIO;
 
           if (tp_asv_get_boolean (fixed_prop,
-              TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
+              TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
             capabilities |= EMPATHY_CAPABILITIES_VIDEO;
 
           for (j = 0; allowed_prop[j] != NULL; j++)
             {
               if (!tp_strdiff (allowed_prop[j],
-                    TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO))
+                    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO))
                 capabilities |= EMPATHY_CAPABILITIES_AUDIO;
               else if (!tp_strdiff (allowed_prop[j],
-                    TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO))
+                    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO))
                 capabilities |= EMPATHY_CAPABILITIES_VIDEO;
             }
         }
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index c701b193d..effbf81bc 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -21,6 +21,8 @@
 
 /* empathy-ft-handler.c */
 
+#include "config.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <telepathy-glib/account-channel-request.h>
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index ad55a9442..2863cf9a7 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_AUTOCONNECT                  "autoconnect"
 #define EMPATHY_PREFS_AUTOAWAY                     "autoaway"
 #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder"
+#define EMPATHY_PREFS_SANITY_CLEANING_NUMBER       "sanity-cleaning-number"
 
 #define EMPATHY_PREFS_NOTIFICATIONS_SCHEMA EMPATHY_PREFS_SCHEMA ".notifications"
 #define EMPATHY_PREFS_NOTIFICATIONS_ENABLED        "notifications-enabled"
@@ -66,6 +67,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 +79,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-keyring.c b/libempathy/empathy-keyring.c
index e63ed12df..fef7a4351 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
+
 #include "empathy-keyring.h"
 
 #include <string.h>
@@ -70,7 +72,7 @@ find_items_cb (GnomeKeyringResult result,
   if (list == NULL)
     {
       g_simple_async_result_set_error (simple, TP_ERROR,
-          TP_ERROR_DOES_NOT_EXIST, "Password not found");
+          TP_ERROR_DOES_NOT_EXIST, _("Password not found"));
       goto out;
     }
 
@@ -213,7 +215,7 @@ empathy_keyring_set_account_password_async (TpAccount *account,
 
   DEBUG ("Remembering password for %s", account_id);
 
-  name = g_strdup_printf ("IM account password for %s (%s)",
+  name = g_strdup_printf (_("IM account password for %s (%s)"),
       tp_account_get_display_name (account), account_id);
 
   gnome_keyring_store_password (&account_keyring_schema, NULL, name, password,
@@ -248,7 +250,7 @@ empathy_keyring_set_room_password_async (TpAccount *account,
 
   DEBUG ("Remembering password for room '%s' on account '%s'", id, account_id);
 
-  name = g_strdup_printf ("Password for chatroom '%s' on account %s (%s)",
+  name = g_strdup_printf (_("Password for chatroom '%s' on account %s (%s)"),
       id, tp_account_get_display_name (account), account_id);
 
   gnome_keyring_store_password (&room_keyring_schema, NULL, name, password,
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..9b1a39217 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -18,9 +18,9 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include "empathy-presence-manager.h"
+#include "config.h"
 
-#include <config.h>
+#include "empathy-presence-manager.h"
 
 #include <string.h>
 
@@ -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-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 117d88f03..1518f3374 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include "empathy-server-sasl-handler.h"
 
 #include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index 31afa276c..b19e9cfde 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include "empathy-server-tls-handler.h"
 
 #include <telepathy-glib/interfaces.h>
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-contact-list.c b/libempathy/empathy-tp-contact-list.c
deleted file mode 100644
index f116d15d3..000000000
--- a/libempathy/empathy-tp-contact-list.c
+++ /dev/null
@@ -1,1226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2007-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: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-
-#include <extensions/extensions.h>
-
-#include "empathy-tp-contact-list.h"
-#include "empathy-tp-contact-factory.h"
-#include "empathy-contact-list.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactList)
-typedef struct {
-	TpConnection   *connection;
-
-	TpChannel      *publish;
-	TpChannel      *subscribe;
-	TpChannel      *stored;
-	/* contact handle (TpHandle) => reffed (EmpathyContact *)
-	 *
-	 * Union of:
-	 *  - members of 'subscribe': we receive their presence
-	 *  - RP of 'subscribe': we asked to receive their presence
-	 *  - members of 'publish': we send them our presence
-	 *  - members of 'stored': they are in our roster
-	 */
-	GHashTable     *members;
-	/* contact handle (TpHandle) => reffed (EmpathyContact *)
-	 *
-	 * Contacts which are local-pending in the publish channel but are NOT in
-	 * the members hash table: they asked to receive our presence and we don't
-	 * receive theirs or asked to.
-	 * That's basically the contacts which asked to add us to their contact
-	 * list and we didn't answer it. */
-	GHashTable     *pendings;
-	/* group name: borrowed (const gchar *)  => reffed (TpChannel *) */
-	GHashTable     *groups;
-	/* group name: owned (gchar *) => owned GArray of TpHandle */
-	GHashTable     *add_to_group;
-} EmpathyTpContactListPriv;
-
-typedef enum {
-	TP_CONTACT_LIST_TYPE_PUBLISH,
-	TP_CONTACT_LIST_TYPE_SUBSCRIBE,
-	TP_CONTACT_LIST_TYPE_UNKNOWN
-} TpContactListType;
-
-static void tp_contact_list_iface_init         (EmpathyContactListIface   *iface);
-
-enum {
-	PROP_0,
-	PROP_CONNECTION,
-};
-
-G_DEFINE_TYPE_WITH_CODE (EmpathyTpContactList, empathy_tp_contact_list, G_TYPE_OBJECT,
-			 G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
-						tp_contact_list_iface_init));
-
-static void
-tp_contact_list_forget_group (EmpathyTpContactList *list,
-			      TpChannel *channel)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	const TpIntSet *members;
-	TpIntSetIter iter;
-	const gchar *group_name;
-
-	group_name = tp_channel_get_identifier (channel);
-
-	/* Signal that all members are not in that group anymore */
-	members = tp_channel_group_get_members (channel);
-	tp_intset_iter_init (&iter, members);
-	while (tp_intset_iter_next (&iter)) {
-		EmpathyContact *contact;
-
-		contact = g_hash_table_lookup (priv->members,
-					       GUINT_TO_POINTER (iter.element));
-		if (contact == NULL) {
-			continue;
-		}
-
-		DEBUG ("Contact %s (%d) removed from group %s",
-			empathy_contact_get_id (contact), iter.element,
-			group_name);
-		g_signal_emit_by_name (list, "groups-changed", contact,
-				       group_name,
-				       FALSE);
-	}
-}
-
-static void
-tp_contact_list_group_invalidated_cb (TpChannel *channel,
-				      guint      domain,
-				      gint       code,
-				      gchar     *message,
-				      EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	const gchar *group_name;
-
-	group_name = tp_channel_get_identifier (channel);
-	DEBUG ("Group %s invalidated. Message: %s", group_name, message);
-
-	tp_contact_list_forget_group (list, channel);
-
-	g_hash_table_remove (priv->groups, group_name);
-}
-
-static void
-contacts_added_to_group (EmpathyTpContactList *list,
-			 TpChannel *channel,
-			 GArray *added)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	const gchar *group_name;
-	guint i;
-
-	group_name = tp_channel_get_identifier (channel);
-
-	for (i = 0; i < added->len; i++) {
-		EmpathyContact *contact;
-		TpHandle handle;
-
-		handle = g_array_index (added, TpHandle, i);
-		contact = g_hash_table_lookup (priv->members,
-					       GUINT_TO_POINTER (handle));
-		if (contact == NULL) {
-			continue;
-		}
-
-		DEBUG ("Contact %s (%d) added to group %s",
-			empathy_contact_get_id (contact), handle, group_name);
-		g_signal_emit_by_name (list, "groups-changed", contact,
-				       group_name,
-				       TRUE);
-	}
-}
-
-static void
-tp_contact_list_group_members_changed_cb (TpChannel     *channel,
-					  gchar         *message,
-					  GArray        *added,
-					  GArray        *removed,
-					  GArray        *local_pending,
-					  GArray        *remote_pending,
-					  guint          actor,
-					  guint          reason,
-					  EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv  *priv = GET_PRIV (list);
-	const gchar *group_name;
-	guint i;
-
-	contacts_added_to_group (list, channel, added);
-
-	group_name = tp_channel_get_identifier (channel);
-
-	for (i = 0; i < removed->len; i++) {
-		EmpathyContact *contact;
-		TpHandle handle;
-
-		handle = g_array_index (removed, TpHandle, i);
-		contact = g_hash_table_lookup (priv->members,
-					       GUINT_TO_POINTER (handle));
-		if (contact == NULL) {
-			continue;
-		}
-
-		DEBUG ("Contact %s (%d) removed from group %s",
-			empathy_contact_get_id (contact), handle, group_name);
-
-		g_signal_emit_by_name (list, "groups-changed", contact,
-				       group_name,
-				       FALSE);
-	}
-}
-
-static void
-tp_contact_list_group_ready_cb (TpChannel *channel,
-				const GError *error,
-				gpointer list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel *old_group;
-	const gchar *group_name;
-	const TpIntSet *members;
-	GArray *arr;
-
-	if (error) {
-		DEBUG ("Error: %s", error->message);
-		g_object_unref (channel);
-		return;
-	}
-
-	group_name = tp_channel_get_identifier (channel);
-
-	/* If there's already a group with this name in the table, we can't
-	 * just let it be replaced. Replacing it causes it to be unreffed,
-	 * which causes it to be invalidated (see
-	 * <https://bugs.freedesktop.org/show_bug.cgi?id=22119>), which causes
-	 * it to be removed from the hash table again, which causes it to be
-	 * unreffed again.
-	 */
-	old_group = g_hash_table_lookup (priv->groups, group_name);
-
-	if (old_group != NULL) {
-		DEBUG ("Discarding old group %s (%p)", group_name, old_group);
-		g_hash_table_steal (priv->groups, group_name);
-		tp_contact_list_forget_group (list, old_group);
-		g_object_unref (old_group);
-	}
-
-	/* Pass the reference on the TpChannel to priv->groups */
-	g_hash_table_insert (priv->groups, (gpointer) group_name, channel);
-	DEBUG ("Group %s added", group_name);
-
-	g_signal_connect (channel, "group-members-changed",
-			  G_CALLBACK (tp_contact_list_group_members_changed_cb),
-			  list);
-
-	g_signal_connect (channel, "invalidated",
-			  G_CALLBACK (tp_contact_list_group_invalidated_cb),
-			  list);
-
-	if (priv->add_to_group) {
-		GArray *handles;
-
-		handles = g_hash_table_lookup (priv->add_to_group, group_name);
-		if (handles) {
-			DEBUG ("Adding initial members to group %s", group_name);
-			tp_cli_channel_interface_group_call_add_members (channel,
-				-1, handles, NULL, NULL, NULL, NULL, NULL);
-			g_hash_table_remove (priv->add_to_group, group_name);
-		}
-	}
-
-	/* Get initial members of the group */
-	members = tp_channel_group_get_members (channel);
-	g_assert (members != NULL);
-	arr = tp_intset_to_array (members);
-	contacts_added_to_group (list, channel, arr);
-	g_array_unref (arr);
-}
-
-static void
-tp_contact_list_group_add_channel (EmpathyTpContactList *list,
-				   const gchar          *object_path,
-				   GHashTable           *properties)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel                *channel;
-	GError *error = NULL;
-
-	channel = tp_channel_new_from_properties (priv->connection,
-				  object_path, properties, &error);
-	if (channel == NULL) {
-		DEBUG ("Failed to create group channel: %s", error->message);
-		g_error_free (error);
-		return;
-	}
-
-	/* Give the ref to the callback */
-	tp_channel_call_when_ready (channel,
-				    tp_contact_list_group_ready_cb,
-				    list);
-}
-
-static void
-tp_contact_list_group_request_channel_cb (TpConnection *connection,
-					  const gchar  *object_path,
-					  const GError *error,
-					  gpointer      user_data,
-					  GObject      *list)
-{
-	/* The new channel will be handled in NewChannel cb. Here we only
-	 * handle the error if RequestChannel failed */
-	if (error) {
-		DEBUG ("Error: %s", error->message);
-		return;
-	}
-}
-
-static void
-tp_contact_list_group_request_handles_cb (TpConnection *connection,
-					  const GArray *handles,
-					  const GError *error,
-					  gpointer      user_data,
-					  GObject      *list)
-{
-	TpHandle channel_handle;
-
-	if (error) {
-		DEBUG ("Error: %s", error->message);
-		return;
-	}
-
-	channel_handle = g_array_index (handles, TpHandle, 0);
-	tp_cli_connection_call_request_channel (connection, -1,
-						TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
-						TP_HANDLE_TYPE_GROUP,
-						channel_handle,
-						TRUE,
-						tp_contact_list_group_request_channel_cb,
-						NULL, NULL,
-						list);
-}
-
-/* This function takes ownership of handles array */
-static void
-tp_contact_list_group_add (EmpathyTpContactList *list,
-			   const gchar          *group_name,
-			   GArray               *handles)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel                *channel;
-	const gchar              *names[] = {group_name, NULL};
-
-	/* Search the channel for that group name */
-	channel = g_hash_table_lookup (priv->groups, group_name);
-	if (channel) {
-		tp_cli_channel_interface_group_call_add_members (channel, -1,
-			handles, NULL, NULL, NULL, NULL, NULL);
-		g_array_unref (handles);
-		return;
-	}
-
-	/* That group does not exist yet, we have to:
-	 * 1) Request an handle for the group name
-	 * 2) Request a channel
-	 * 3) When NewChannel is emitted, add handles in members
-	 */
-	g_hash_table_insert (priv->add_to_group,
-			     g_strdup (group_name),
-			     handles);
-	tp_cli_connection_call_request_handles (priv->connection, -1,
-						TP_HANDLE_TYPE_GROUP, names,
-						tp_contact_list_group_request_handles_cb,
-						NULL, NULL,
-						G_OBJECT (list));
-}
-
-static void
-got_added_members_cb (TpConnection            *connection,
-		      guint                    n_contacts,
-		      EmpathyContact * const * contacts,
-		      guint                    n_failed,
-		      const TpHandle          *failed,
-		      const GError            *error,
-		      gpointer                 user_data,
-		      GObject                 *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	guint i;
-
-	if (error) {
-		DEBUG ("Error: %s", error->message);
-		return;
-	}
-
-	for (i = 0; i < n_contacts; i++) {
-		EmpathyContact *contact = contacts[i];
-		TpHandle handle = empathy_contact_get_handle (contact);
-
-		if (g_hash_table_lookup (priv->members, GUINT_TO_POINTER (handle)))
-			continue;
-
-		/* Add to the list and emit signal */
-		g_hash_table_insert (priv->members, GUINT_TO_POINTER (handle),
-				     g_object_ref (contact));
-		g_signal_emit_by_name (list, "members-changed", contact,
-				       0, 0, NULL, TRUE);
-	}
-}
-
-static void
-add_to_members (EmpathyTpContactList *list,
-		GArray *handles)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	GArray *request;
-	guint i;
-
-	if (handles->len == 0)
-		return;
-
-	request = g_array_new (FALSE, FALSE, sizeof (TpHandle));
-
-	for (i = 0; i < handles->len; i++) {
-		TpHandle handle = g_array_index (handles, TpHandle, i);
-
-		if (g_hash_table_lookup (priv->members, GUINT_TO_POINTER (handle)))
-			continue;
-
-		g_array_append_val (request, handle);
-	}
-
-	if (request->len > 0) {
-			empathy_tp_contact_factory_get_from_handles (priv->connection,
-				request->len, (TpHandle *) request->data,
-				got_added_members_cb, NULL, NULL, G_OBJECT (list));
-	}
-
-	g_array_unref (request);
-}
-
-static void
-tp_contact_list_got_local_pending_cb (TpConnection            *connection,
-				      guint                    n_contacts,
-				      EmpathyContact * const * contacts,
-				      guint                    n_failed,
-				      const TpHandle          *failed,
-				      const GError            *error,
-				      gpointer                 user_data,
-				      GObject                 *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	guint i;
-
-	if (error) {
-		DEBUG ("Error: %s", error->message);
-		return;
-	}
-
-	for (i = 0; i < n_contacts; i++) {
-		EmpathyContact *contact = contacts[i];
-		TpHandle handle;
-		const gchar *message;
-		TpChannelGroupChangeReason reason;
-		const TpIntSet *members, *remote_pending;
-
-		handle = empathy_contact_get_handle (contact);
-		members = tp_channel_group_get_members (priv->subscribe);
-		remote_pending = tp_channel_group_get_remote_pending (priv->subscribe);
-
-		if (tp_intset_is_member (members, handle) ||
-		    tp_intset_is_member (remote_pending, handle)) {
-			GArray handles = {(gchar *) &handle, 1};
-
-			/* This contact is already subscribed, or user requested
-			 * to subscribe, auto accept. */
-			tp_cli_channel_interface_group_call_add_members (priv->publish,
-				-1, &handles, NULL, NULL, NULL, NULL, NULL);
-		}
-		else if (tp_channel_group_get_local_pending_info (priv->publish,
-								  handle,
-								  NULL,
-								  &reason,
-								  &message)) {
-			/* Add contact to pendings */
-			g_hash_table_insert (priv->pendings, GUINT_TO_POINTER (handle),
-					     g_object_ref (contact));
-			g_signal_emit_by_name (list, "pendings-changed", contact,
-					       contact, reason, message, TRUE);
-		}
-	}
-}
-
-static void
-tp_contact_list_remove_handle (EmpathyTpContactList *list,
-			       GHashTable *table,
-			       TpHandle handle)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	EmpathyContact *contact;
-	const gchar *sig;
-
-	if (table == priv->pendings)
-		sig = "pendings-changed";
-	else if (table == priv->members)
-		sig = "members-changed";
-	else
-		return;
-
-	contact = g_hash_table_lookup (table, GUINT_TO_POINTER (handle));
-	if (contact) {
-		g_object_ref (contact);
-		g_hash_table_remove (table, GUINT_TO_POINTER (handle));
-		g_signal_emit_by_name (list, sig, contact, 0, 0, NULL,
-				       FALSE);
-		g_object_unref (contact);
-	}
-}
-
-static void
-remove_from_member_if_needed (EmpathyTpContactList *list,
-			      TpHandle handle)
-{
-	/* remove contact from members if it's not in publish and subscribe */
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	const TpIntSet *members;
-
-	members = tp_channel_group_get_members (priv->subscribe);
-	if (tp_intset_is_member (members, handle))
-		return;
-
-	members = tp_channel_group_get_remote_pending (priv->subscribe);
-	if (tp_intset_is_member (members, handle))
-		return;
-
-	members = tp_channel_group_get_members (priv->publish);
-	if (tp_intset_is_member (members, handle))
-		return;
-
-	tp_contact_list_remove_handle (list, priv->members, handle);
-}
-
-static void
-tp_contact_list_publish_group_members_changed_cb (TpChannel     *channel,
-						  gchar         *message,
-						  GArray        *added,
-						  GArray        *removed,
-						  GArray        *local_pending,
-						  GArray        *remote_pending,
-						  TpHandle       actor,
-						  TpChannelGroupChangeReason reason,
-						  EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	guint i;
-
-	/* We now send our presence to those contacts, remove them from pendings */
-	add_to_members (list, added);
-	for (i = 0; i < added->len; i++) {
-		tp_contact_list_remove_handle (list, priv->pendings,
-			g_array_index (added, TpHandle, i));
-	}
-
-	/* We refuse to send our presence to those contacts, remove from pendings */
-	for (i = 0; i < removed->len; i++) {
-		TpHandle handle = g_array_index (removed, TpHandle, i);
-
-		tp_contact_list_remove_handle (list, priv->pendings, handle);
-		remove_from_member_if_needed (list, handle);
-	}
-
-	/* Those contacts want our presence, auto accept those that are already
-	 * member, otherwise add in pendings. */
-	if (local_pending->len > 0) {
-		empathy_tp_contact_factory_get_from_handles (priv->connection,
-			local_pending->len, (TpHandle *) local_pending->data,
-			tp_contact_list_got_local_pending_cb, NULL, NULL,
-			G_OBJECT (list));
-	}
-}
-
-static void
-tp_contact_list_subscribe_group_members_changed_cb (TpChannel     *channel,
-						    gchar         *message,
-						    GArray        *added,
-						    GArray        *removed,
-						    GArray        *local_pending,
-						    GArray        *remote_pending,
-						    guint          actor,
-						    guint          reason,
-						    EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	guint i;
-	GArray *accept;
-
-	/* We now get the presence of those contacts, add them to members */
-	add_to_members (list, added);
-
-	/* Those contacts refuse to send us their presence, remove from members. */
-	for (i = 0; i < removed->len; i++) {
-		remove_from_member_if_needed (list, g_array_index (removed, TpHandle, i));
-	}
-
-	/* We want those contacts in our contact list but we don't get their
-	 * presence yet. Add to members anyway. */
-	add_to_members (list, remote_pending);
-
-	/* Implicitly accept pending request of contacts which are now members. */
-	if (priv->publish == NULL)
-		return;
-
-	accept = g_array_new (FALSE, FALSE, sizeof (TpHandle));
-	for (i = 0; i < added->len; i++) {
-		TpHandle handle = g_array_index (added, TpHandle, i);
-
-		if (g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle)) != NULL)
-			g_array_append_val (accept, handle);
-	}
-
-	for (i = 0; i < remote_pending->len; i++) {
-		TpHandle handle = g_array_index (added, TpHandle, i);
-
-		if (g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle)) != NULL)
-			g_array_append_val (accept, handle);
-	}
-
-	tp_cli_channel_interface_group_call_add_members (priv->publish,
-		-1, accept, NULL, NULL, NULL, NULL, NULL);
-
-	g_array_unref (accept);
-}
-
-static void
-tp_contact_list_store_group_members_changed_cb (TpChannel     *channel,
-						gchar         *message,
-						GArray        *added,
-						GArray        *removed,
-						GArray        *local_pending,
-						GArray        *remote_pending,
-						guint          actor,
-						guint          reason,
-						EmpathyTpContactList *list)
-{
-	guint i;
-
-	add_to_members (list, added);
-
-	for (i = 0; i < removed->len; i++) {
-		remove_from_member_if_needed (list, g_array_index (removed, TpHandle, i));
-	}
-}
-
-static void
-tp_contact_list_finalize (GObject *object)
-{
-	EmpathyTpContactListPriv *priv;
-	EmpathyTpContactList     *list;
-	GHashTableIter            iter;
-	gpointer                  channel;
-
-	list = EMPATHY_TP_CONTACT_LIST (object);
-	priv = GET_PRIV (list);
-
-	DEBUG ("finalize: %p", object);
-
-	if (priv->subscribe) {
-		g_object_unref (priv->subscribe);
-	}
-	if (priv->publish) {
-		g_object_unref (priv->publish);
-	}
-	if (priv->stored) {
-		g_object_unref (priv->stored);
-	}
-
-	if (priv->connection) {
-		g_object_unref (priv->connection);
-	}
-
-	g_hash_table_iter_init (&iter, priv->groups);
-	while (g_hash_table_iter_next (&iter, NULL, &channel)) {
-		g_signal_handlers_disconnect_by_func (channel,
-			tp_contact_list_group_invalidated_cb, list);
-	}
-
-	g_hash_table_unref (priv->groups);
-	g_hash_table_unref (priv->members);
-	g_hash_table_unref (priv->pendings);
-	g_hash_table_unref (priv->add_to_group);
-
-	G_OBJECT_CLASS (empathy_tp_contact_list_parent_class)->finalize (object);
-}
-
-static void
-got_list_channel (EmpathyTpContactList *list,
-		  TpChannel *channel)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	const gchar *id;
-
-	/* We requested that channel by providing TargetID property, so it's
-	 * guaranteed that tp_channel_get_identifier will return it. */
-	id = tp_channel_get_identifier (channel);
-
-	/* TpChannel emits initial set of members just before being ready */
-	if (!tp_strdiff (id, "stored")) {
-		if (priv->stored != NULL)
-			return;
-		priv->stored = g_object_ref (channel);
-		g_signal_connect (priv->stored, "group-members-changed",
-				  G_CALLBACK (tp_contact_list_store_group_members_changed_cb),
-				  list);
-	} else if (!tp_strdiff (id, "publish")) {
-		if (priv->publish != NULL)
-			return;
-		priv->publish = g_object_ref (channel);
-		g_signal_connect (priv->publish, "group-members-changed",
-				  G_CALLBACK (tp_contact_list_publish_group_members_changed_cb),
-				  list);
-	} else if (!tp_strdiff (id, "subscribe")) {
-		if (priv->subscribe != NULL)
-			return;
-		priv->subscribe = g_object_ref (channel);
-		g_signal_connect (priv->subscribe, "group-members-changed",
-				  G_CALLBACK (tp_contact_list_subscribe_group_members_changed_cb),
-				  list);
-	}
-}
-
-static void
-list_ensure_channel_cb (TpConnection *conn,
-			gboolean yours,
-			const gchar *path,
-			GHashTable *properties,
-			const GError *error,
-			gpointer user_data,
-			GObject *weak_object)
-{
-	EmpathyTpContactList *list = user_data;
-	TpChannel *channel;
-
-	if (error != NULL) {
-		DEBUG ("failed: %s\n", error->message);
-		return;
-	}
-
-	channel = tp_channel_new_from_properties (conn, path, properties, NULL);
-	got_list_channel (list, channel);
-	g_object_unref (channel);
-}
-
-static void
-iterate_on_channels (EmpathyTpContactList *list,
-		     const GPtrArray *channels)
-{
-	guint i;
-
-	for (i = 0; i < channels->len ; i++) {
-		GValueArray *arr = g_ptr_array_index (channels, i);
-		const gchar *path;
-		GHashTable *properties;
-		TpHandleType handle_type;
-
-		path = g_value_get_boxed (g_value_array_get_nth (arr, 0));
-		properties = g_value_get_boxed (g_value_array_get_nth (arr, 1));
-
-		if (tp_strdiff (tp_asv_get_string (properties,
-				TP_IFACE_CHANNEL ".ChannelType"),
-		    TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
-			continue;
-
-		if (tp_asv_get_string (properties, TP_IFACE_CHANNEL ".TargetID") == NULL)
-			continue;
-
-		handle_type = tp_asv_get_uint32 (properties,
-			TP_IFACE_CHANNEL ".TargetHandleType", NULL);
-
-		if (handle_type != TP_HANDLE_TYPE_GROUP)
-			continue;
-
-		tp_contact_list_group_add_channel (list, path, properties);
-	}
-}
-
-static void
-new_channels_cb (TpConnection *conn,
-		 const GPtrArray *channels,
-		 gpointer user_data,
-		 GObject *weak_object)
-{
-	EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
-
-	iterate_on_channels (list, channels);
-}
-
-static void
-got_channels_cb (TpProxy *conn,
-		 const GValue *out,
-		 const GError *error,
-		 gpointer user_data,
-		 GObject *weak_object)
-{
-	EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object);
-	const GPtrArray *channels;
-
-	if (error != NULL) {
-		DEBUG ("Get Channels property failed: %s", error->message);
-		return;
-	}
-
-	channels = g_value_get_boxed (out);
-	iterate_on_channels (list, channels);
-}
-
-static void
-conn_ready_cb (TpConnection *connection,
-	       const GError *error,
-	       gpointer data)
-{
-	EmpathyTpContactList *list = data;
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	GHashTable *request;
-
-	if (error != NULL) {
-		DEBUG ("failed: %s", error->message);
-		goto out;
-	}
-
-	/* Look for existing group channels */
-	tp_cli_dbus_properties_call_get (connection, -1,
-		TP_IFACE_CONNECTION_INTERFACE_REQUESTS, "Channels", got_channels_cb,
-		NULL, NULL, G_OBJECT (list));
-
-	request = tp_asv_new (
-		TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
-		TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_LIST,
-		NULL);
-
-	/* Watch the NewChannels signal so if ensuring list channels fails (for
-	 * example because the server is slow and the D-Bus call timeouts before CM
-	 * fetches the roster), we have a chance to get them later. */
-	tp_cli_connection_interface_requests_connect_to_new_channels (
-		priv->connection, new_channels_cb, NULL, NULL, G_OBJECT (list), NULL);
-
-	/* Request the 'stored' list. */
-	tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "stored");
-	tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
-		G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
-
-	/* Request the 'publish' list. */
-	tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "publish");
-	tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
-		G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
-
-	/* Request the 'subscribe' list. */
-	tp_asv_set_static_string (request, TP_PROP_CHANNEL_TARGET_ID, "subscribe");
-	tp_cli_connection_interface_requests_call_ensure_channel (priv->connection,
-		G_MAXINT, request, list_ensure_channel_cb, list, NULL, G_OBJECT (list));
-
-	g_hash_table_unref (request);
-
-out:
-	g_object_unref (list);
-}
-
-static void
-tp_contact_list_constructed (GObject *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-
-	tp_connection_call_when_ready (priv->connection, conn_ready_cb,
-		g_object_ref (list));
-}
-
-static void
-tp_contact_list_get_property (GObject    *object,
-			      guint       param_id,
-			      GValue     *value,
-			      GParamSpec *pspec)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_CONNECTION:
-		g_value_set_object (value, priv->connection);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	};
-}
-
-static void
-tp_contact_list_set_property (GObject      *object,
-			      guint         param_id,
-			      const GValue *value,
-			      GParamSpec   *pspec)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_CONNECTION:
-		priv->connection = g_value_dup_object (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	};
-}
-
-static void
-empathy_tp_contact_list_class_init (EmpathyTpContactListClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = tp_contact_list_finalize;
-	object_class->constructed = tp_contact_list_constructed;
-	object_class->get_property = tp_contact_list_get_property;
-	object_class->set_property = tp_contact_list_set_property;
-
-	g_object_class_install_property (object_class,
-					 PROP_CONNECTION,
-					 g_param_spec_object ("connection",
-							      "The Connection",
-							      "The connection associated with the contact list",
-							      TP_TYPE_CONNECTION,
-							      G_PARAM_READWRITE |
-							      G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof (EmpathyTpContactListPriv));
-}
-
-static void
-tp_contact_list_array_free (gpointer handles)
-{
-	g_array_unref (handles);
-}
-
-static void
-empathy_tp_contact_list_init (EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (list,
-		EMPATHY_TYPE_TP_CONTACT_LIST, EmpathyTpContactListPriv);
-
-	list->priv = priv;
-
-	/* Map group's name to group's TpChannel. The group name string is owned
-	 * by the TpChannel object */
-	priv->groups = g_hash_table_new_full (g_str_hash, g_str_equal,
-					      NULL,
-					      (GDestroyNotify) g_object_unref);
-
-	/* Map contact's handle to EmpathyContact object */
-	priv->members = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-					       NULL,
-					       (GDestroyNotify) g_object_unref);
-
-	/* Map contact's handle to EmpathyContact object */
-	priv->pendings = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-						NULL,
-						(GDestroyNotify) g_object_unref);
-
-	/* Map group's name to GArray of handle */
-	priv->add_to_group = g_hash_table_new_full (g_str_hash, g_str_equal,
-						    g_free,
-						    tp_contact_list_array_free);
-}
-
-EmpathyTpContactList *
-empathy_tp_contact_list_new (TpConnection *connection)
-{
-	return g_object_new (EMPATHY_TYPE_TP_CONTACT_LIST,
-			     "connection", connection,
-			     NULL);
-}
-
-TpConnection *
-empathy_tp_contact_list_get_connection (EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv;
-
-	g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), NULL);
-
-	priv = GET_PRIV (list);
-
-	return priv->connection;
-}
-
-static void
-tp_contact_list_add (EmpathyContactList *list,
-		     EmpathyContact     *contact,
-		     const gchar        *message)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpHandle handle;
-	GArray handles = {(gchar *) &handle, 1};
-
-	handle = empathy_contact_get_handle (contact);
-
-	if (priv->subscribe) {
-		tp_cli_channel_interface_group_call_add_members (priv->subscribe,
-			-1, &handles, message, NULL, NULL, NULL, NULL);
-	}
-
-	if (priv->publish) {
-		TpChannelGroupFlags flags = tp_channel_group_get_flags (priv->subscribe);
-		if (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD ||
-		    g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) {
-			tp_cli_channel_interface_group_call_add_members (priv->publish,
-				-1, &handles, message, NULL, NULL, NULL, NULL);
-		}
-	}
-
-	/* We want to unblock the contact */
-	if (tp_proxy_has_interface_by_id (priv->connection,
-		TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) {
-		TpContact *tp_contact = empathy_contact_get_tp_contact (contact);
-
-		if (tp_contact != NULL)
-			tp_contact_unblock_async (tp_contact, NULL, NULL);
-	}
-}
-
-static void
-tp_contact_list_remove (EmpathyContactList *list,
-			EmpathyContact     *contact,
-			const gchar        *message)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpHandle handle;
-	GArray handles = {(gchar *) &handle, 1};
-
-	handle = empathy_contact_get_handle (contact);
-
-	/* FIXME: this is racy if tp_contact_list_remove is called before the
-	 * 'stored' list has been retrieved. */
-	if (priv->stored != NULL) {
-		tp_cli_channel_interface_group_call_remove_members (priv->stored,
-			-1, &handles, message, NULL, NULL, NULL, NULL);
-	}
-
-	if (priv->subscribe) {
-		tp_cli_channel_interface_group_call_remove_members (priv->subscribe,
-			-1, &handles, message, NULL, NULL, NULL, NULL);
-	}
-	if (priv->publish) {
-		tp_cli_channel_interface_group_call_remove_members (priv->publish,
-			-1, &handles, message, NULL, NULL, NULL, NULL);
-	}
-}
-
-static GList *
-tp_contact_list_get_members (EmpathyContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	GList *ret;
-
-	ret = g_hash_table_get_values (priv->members);
-	g_list_foreach (ret, (GFunc) g_object_ref, NULL);
-	return ret;
-}
-
-static GList *
-tp_contact_list_get_pendings (EmpathyContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	GList *ret;
-
-	ret = g_hash_table_get_values (priv->pendings);
-	g_list_foreach (ret, (GFunc) g_object_ref, NULL);
-	return ret;
-}
-
-static GList *
-tp_contact_list_get_groups (EmpathyContactList *list,
-			    EmpathyContact     *contact)
-{
-	EmpathyTpContactListPriv  *priv = GET_PRIV (list);
-	GList                     *ret = NULL;
-	GHashTableIter             iter;
-	gpointer                   group_name;
-	gpointer                   channel;
-	TpHandle                   handle;
-
-	handle = empathy_contact_get_handle (contact);
-	g_hash_table_iter_init (&iter, priv->groups);
-	while (g_hash_table_iter_next (&iter, &group_name, &channel)) {
-		const TpIntSet *members;
-
-		members = tp_channel_group_get_members (channel);
-		if (tp_intset_is_member (members, handle)) {
-			ret = g_list_prepend (ret, g_strdup (group_name));
-		}
-	}
-
-	return ret;
-}
-
-static void
-tp_contact_list_add_to_group (EmpathyContactList *list,
-			      EmpathyContact     *contact,
-			      const gchar        *group_name)
-{
-	TpHandle handle;
-	GArray *handles;
-
-	handle = empathy_contact_get_handle (contact);
-	handles = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
-	g_array_append_val (handles, handle);
-	tp_contact_list_group_add (EMPATHY_TP_CONTACT_LIST (list),
-				   group_name, handles);
-}
-
-static void
-tp_contact_list_remove_from_group (EmpathyContactList *list,
-				   EmpathyContact     *contact,
-				   const gchar        *group_name)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel                *channel;
-	TpHandle                  handle;
-	GArray                    handles = {(gchar *) &handle, 1};
-
-	channel = g_hash_table_lookup (priv->groups, group_name);
-	if (channel == NULL) {
-		return;
-	}
-
-	handle = empathy_contact_get_handle (contact);
-	DEBUG ("remove contact %s (%d) from group %s",
-		empathy_contact_get_id (contact), handle, group_name);
-
-	tp_cli_channel_interface_group_call_remove_members (channel, -1,
-		&handles, NULL, NULL, NULL, NULL, NULL);
-}
-
-static void
-tp_contact_list_rename_group (EmpathyContactList *list,
-			      const gchar        *old_group_name,
-			      const gchar        *new_group_name)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel                *channel;
-	const TpIntSet           *members;
-	GArray                   *handles;
-
-	channel = g_hash_table_lookup (priv->groups, old_group_name);
-	if (channel == NULL) {
-		return;
-	}
-
-	DEBUG ("rename group %s to %s", old_group_name, new_group_name);
-
-	/* Remove all members and close the old channel */
-	members = tp_channel_group_get_members (channel);
-	handles = tp_intset_to_array (members);
-	tp_cli_channel_interface_group_call_remove_members (channel, -1,
-		handles, NULL, NULL, NULL, NULL, NULL);
-	tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
-
-	tp_contact_list_group_add (EMPATHY_TP_CONTACT_LIST (list),
-				   new_group_name, handles);
-}
-
-static void
-tp_contact_list_remove_group (EmpathyContactList *list,
-			      const gchar *group_name)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	TpChannel                *channel;
-	const TpIntSet           *members;
-	GArray                   *handles;
-
-	channel = g_hash_table_lookup (priv->groups, group_name);
-	if (channel == NULL) {
-		return;
-	}
-
-	DEBUG ("remove group %s", group_name);
-
-	/* Remove all members and close the channel */
-	members = tp_channel_group_get_members (channel);
-	handles = tp_intset_to_array (members);
-	tp_cli_channel_interface_group_call_remove_members (channel, -1,
-		handles, NULL, NULL, NULL, NULL, NULL);
-	tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
-	g_array_unref (handles);
-}
-
-static void
-tp_contact_list_iface_init (EmpathyContactListIface *iface)
-{
-	iface->add               = tp_contact_list_add;
-	iface->remove            = tp_contact_list_remove;
-	iface->get_members       = tp_contact_list_get_members;
-	iface->get_pendings      = tp_contact_list_get_pendings;
-	iface->get_groups        = tp_contact_list_get_groups;
-	iface->add_to_group      = tp_contact_list_add_to_group;
-	iface->remove_from_group = tp_contact_list_remove_from_group;
-	iface->rename_group      = tp_contact_list_rename_group;
-	iface->remove_group	 = tp_contact_list_remove_group;
-}
-
-void
-empathy_tp_contact_list_remove_all (EmpathyTpContactList *list)
-{
-	EmpathyTpContactListPriv *priv = GET_PRIV (list);
-	GHashTableIter            iter;
-	gpointer                  contact;
-
-	g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list));
-
-	/* Remove all contacts */
-	g_hash_table_iter_init (&iter, priv->members);
-	while (g_hash_table_iter_next (&iter, NULL, &contact)) {
-		g_signal_emit_by_name (list, "members-changed", contact,
-				       NULL, 0, NULL,
-				       FALSE);
-	}
-	g_hash_table_remove_all (priv->members);
-
-	g_hash_table_iter_init (&iter, priv->pendings);
-	while (g_hash_table_iter_next (&iter, NULL, &contact)) {
-		g_signal_emit_by_name (list, "pendings-changed", contact,
-				       NULL, 0, NULL,
-				       FALSE);
-	}
-	g_hash_table_remove_all (priv->pendings);
-}
diff --git a/libempathy/empathy-tp-contact-list.h b/libempathy/empathy-tp-contact-list.h
deleted file mode 100644
index 9a555bc7a..000000000
--- a/libempathy/empathy-tp-contact-list.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2007-2008 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>
- */
-
-#ifndef __EMPATHY_TP_CONTACT_LIST_H__
-#define __EMPATHY_TP_CONTACT_LIST_H__
-
-#include <glib.h>
-#include <telepathy-glib/connection.h>
-
-#include <libempathy/empathy-contact.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_TP_CONTACT_LIST         (empathy_tp_contact_list_get_type ())
-#define EMPATHY_TP_CONTACT_LIST(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyTpContactList))
-#define EMPATHY_TP_CONTACT_LIST_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_LIST, EmpathyTpContactListClass))
-#define EMPATHY_IS_TP_CONTACT_LIST(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST))
-#define EMPATHY_IS_TP_CONTACT_LIST_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_LIST))
-#define EMPATHY_TP_CONTACT_LIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyTpContactListClass))
-
-typedef struct _EmpathyTpContactList      EmpathyTpContactList;
-typedef struct _EmpathyTpContactListClass EmpathyTpContactListClass;
-
-struct _EmpathyTpContactList {
-	GObject parent;
-	gpointer priv;
-};
-
-struct _EmpathyTpContactListClass {
-	GObjectClass parent_class;
-};
-
-GType                  empathy_tp_contact_list_get_type    (void) G_GNUC_CONST;
-EmpathyTpContactList * empathy_tp_contact_list_new         (TpConnection         *connection);
-TpConnection *         empathy_tp_contact_list_get_connection (EmpathyTpContactList *list);
-void                   empathy_tp_contact_list_remove_all  (EmpathyTpContactList *list);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_TP_CONTACT_LIST_H__ */
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..bf523c6e3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,14 +2,14 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in.in
-data/org.gnome.Empathy.gschema.xml.in
 data/empathy-accounts.desktop.in.in
+data/org.gnome.Empathy.gschema.xml.in
 
 libempathy/empathy-ft-handler.c
 libempathy/empathy-message.c
-libempathy/empathy-tp-contact-list.c
 libempathy/empathy-utils.c
 libempathy/empathy-time.c
+libempathy/empathy-keyring.c
 
 libempathy-gtk/empathy-account-chooser.c
 libempathy-gtk/empathy-account-widget.c
@@ -43,14 +43,12 @@ libempathy-gtk/empathy-groups-widget.c
 libempathy-gtk/empathy-individual-dialogs.c
 libempathy-gtk/empathy-individual-edit-dialog.c
 libempathy-gtk/empathy-individual-information-dialog.c
-libempathy-gtk/empathy-individual-linker.c
 libempathy-gtk/empathy-individual-menu.c
 libempathy-gtk/empathy-individual-view.c
 libempathy-gtk/empathy-individual-widget.c
 [type: gettext/glade]libempathy-gtk/empathy-individual-widget.ui
 libempathy-gtk/empathy-irc-network-chooser-dialog.c
 libempathy-gtk/empathy-irc-network-dialog.c
-libempathy-gtk/empathy-linking-dialog.c
 libempathy-gtk/empathy-log-window.c
 [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
 libempathy-gtk/empathy-new-message-dialog.c
@@ -77,11 +75,9 @@ nautilus-sendto-plugin/empathy-nautilus-sendto.c
 
 src/empathy.c
 src/empathy-about-dialog.c
-src/empathy-account-assistant.c
 src/empathy-accounts-dialog.c
 [type: gettext/glade]src/empathy-accounts-dialog.ui
 src/empathy-auth-client.c
-src/empathy-auto-salut-account-helper.c
 src/empathy-av.c
 src/empathy-streamed-media-window.c
 [type: gettext/glade]src/empathy-call-window.ui
@@ -121,3 +117,4 @@ src/empathy-call-window.c
 src/empathy-call.c
 libempathy-gtk/empathy-search-bar.c
 libempathy-gtk/empathy-new-account-dialog.c
+libempathy-gtk/empathy-local-xmpp-assistant-widget.c
diff --git a/po/ar.po b/po/ar.po
index 4bd821e13..853524f84 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,411 +6,458 @@
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Abou Manal <aboumanal@gmail.com>, 2008.
 # Djihed Afifi<djihed@gmail.com, 2008.
-# Anas Afif Emad <anas.e87@gmail.com, 2008.
+# Anas Afif Emad <anas.e87@gmail.com, 2008, 2012.
 # Khaled Hosny <khaledhosny@eglug.org>, 2006, 2009, 2010, 2011.
+# Abderrahim Kitouni <a.kitouni@gmail.com>, 2012.
+# Ibrahim Saed <ibraheem5000@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 02:56+0200\n"
-"PO-Revision-Date: 2011-03-19 02:56+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-01 09:19+0000\n"
+"PO-Revision-Date: 2012-02-25 09:44+0200\n"
+"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
+"Language-Team: Arabeyes\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "دردش عبر جوجل توك و �يسبوك و MSN وغيرها من خدمات الدردشة"
+msgid "Empathy"
+msgstr "إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy"
-msgstr "إمبثي"
+msgid "IM Client"
+msgstr "عميل محادثة �ورية"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "المرسال إمبثي"
+msgstr "مرسال الإنترنت إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "مرسال محادثة �ورية"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "دردش عبر جوجل توك و�يسبوك وMSN وغيرها من خدمات الدردشة"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "حسابات التراسل"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "ا�تح نا�ذة واحدة لكل محادثة."
+msgid "Connection managers should be used"
+msgstr "يجب استعمال مدراء الاتصال"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"الم�حر� الذي يجب إضا�ته بعد الأسماء عند استعمال (Tab) لتكملة الأسماء �ي "
-"المحادثات الجماعية."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "�يما إذا يستخدم مدراء الشبكة لقطع الاتصال أو استرجاعه."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "سمة نا�ذة المحادثة"
+msgid "Empathy should auto-connect on startup"
+msgstr "الاتصال الآلي عند بدء البرنامج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "قائمة لغات التدقيق الإملائي (ا�صل ب�اصلة، مثال: en, fr, nl)"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "�يما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "لائحة مختصرة للمتراسلين"
+msgid "Empathy should auto-away when idle"
+msgstr "على إمبثي تغيير الحالة إلى بعيد تلقائيًا عند الخمول"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Connection managers should be used"
-msgstr "يجب استعمال مدراء الشبكة"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "�يما إذا كان على إمبثي الانتقال إلى حالة بعيد تلقائيا عند السكون."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Contact list sort criterion"
-msgstr "معيار ترتيب لائحة المتراسلين"
+msgid "Empathy default download folder"
+msgstr "مجلد التنزيل الا�تراضي لإمبثي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Default directory to select an avatar image from"
-msgstr "المجلد المبدئي لاختيار الصورة الشخصية"
+msgid "The default folder to save file transfers in."
+msgstr "المجلد المبدئي لح�ظ المل�ات المنقولة �يه."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Disable popup notifications when away"
-msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدا"
+msgid "Show offline contacts"
+msgstr "أظهر المتراسلين غير المتَّصلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable sounds when away"
-msgstr "عطل الأصوات عندما أكون بعيدا"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "عرض المرسلين غير المتصلين �ي لائحة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Display incoming events in the status area"
-msgstr "اعرض الأحداث القادمة �ي منطقة الحالة"
+msgid "Show avatars"
+msgstr "أعرض الصور الشخصية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"اعرض الأحداث القادمة �ي منطقة الحالة. إذا لم يكن صحيحا �ستعرض مباشرة على "
-"المستخدم."
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "إظهار صور شخصية للمتراسلين �ي لائحة المتراسلين ونوا�ذ المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Empathy can publish the user's location"
-msgstr "يستطيع إمبثي نشر مكان المستخدم"
+msgid "Show protocols"
+msgstr "أظهر البروتوكولات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can use the GPS to guess the location"
-msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ما إذا ست�عرض بروتوكولات المتراسلين �ي القائمة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "يستطيع إمبثي استخدام شبكة الهات� المحمول لتخمين مكان المستخدم"
+msgid "Show Balance in contact list"
+msgstr "أظهر الرصيد �ي قائمة المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the network to guess the location"
-msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
+msgid "Whether to show account balances in the contact list."
+msgstr "لعرض رصيد الحساب �ي قائمة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy default download folder"
-msgstr "مجلد التنزيل المبدئي لإمبثي"
+msgid "Compact contact list"
+msgstr "لائحة مصغرة للمتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "رحّل إمبثي سجلات butterfly"
+msgid "Whether to show the contact list in compact mode."
+msgstr "عرض قائمة المتراسلين �ي شكلها المختصر."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy should auto-away when idle"
-msgstr "على إمبثى تغيير الحالة إلى بعيد تلقائيا عند الخمول"
+msgid "Hide main window"
+msgstr "أخ�� النا�ذة الرئيسية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-connect on startup"
-msgstr "الاتصال الآلي عند بدء البرنامج"
+msgid "Hide the main window."
+msgstr "أخ�� النا�ذة الرئيسية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should reduce the location's accuracy"
-msgstr "على إمبثي تقليل دقة تحديد المكان"
+msgid "Default directory to select an avatar image from"
+msgstr "المجلد المبدئي لاختيار الصورة الشخصية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنا�ذة المحادثة"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "آخر مجلد اخت�يرت منه الصورة الشخصية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Enable WebKit Developer Tools"
-msgstr "�عّل أدوات وب‌ك�ت للمطورين"
+msgid "Open new chats in separate windows"
+msgstr "ا�تح المحادثات الجديدة �ي نوا�ذ من�صلة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable popup notifications for new messages"
-msgstr "�عّل التنبيهات المنبثقة للرسائل الجديدة"
+msgid "Always open a separate chat window for new chats."
+msgstr "ا�تح نا�ذة من�صلة دائمًا للمحادثات الجديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable spell checker"
-msgstr "�عّل التدقيق الإملائي"
+msgid "Display incoming events in the status area"
+msgstr "اعرض الأحداث الواردة �ي منطقة الحالة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Hide main window"
-msgstr "أخ�� النا�ذة الرئيسية"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"اعرض الأحداث الواردة �ي منطقة الحالة. إذا لم يكن صحيحا �ستعرض مباشرة على "
+"المستخدم."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide the main window."
-msgstr "أخ�� النا�ذة الرئيسية"
+msgid "The position for the chat window side pane"
+msgstr "موضع اللوحة الجانبية �ي نا�ذة الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Nick completed character"
-msgstr "م�حر� الكنية التام"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "الموضع المح�وظ (بالبكسل) للّوحة الجانبية �ي نا�ذة الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Open new chats in separate windows"
-msgstr "ا�تح المحادثات الجديدة �ي نوا�ذ مت�رقة"
+msgid "Show contact groups"
+msgstr "أظهر مجموعات المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Path of the Adium theme to use"
-msgstr "مسار سمة Adium لتستخدم"
+msgid "Whether to show groups in the contact list."
+msgstr "إذا كنت ترغب �ي إظهار المجموعات �ي قائمة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "مسار سمة Adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة Adium."
+msgid "Contact list sort criterion"
+msgstr "معيار ترتيب لائحة المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Play a sound for incoming messages"
-msgstr "شغل صوت عند وصول الرسائل"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"المعيار المطلوب استخدامه لترتيب قائمة المتراسلين. الأصل هو الترتيب حسب حالة "
+"المتراسل باستخدام القيمة \"الحالة\". لترتيب المتراسلين حسب الاسم استخدم "
+"القيمة \"الاسم\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Play a sound for new conversations"
-msgstr "شغل صوت للمحادثات الجديدة"
+msgid "Use notification sounds"
+msgstr "استخدم أصوات التبليغ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for outgoing messages"
-msgstr "شغل صوت عند إرسال الرسائل"
+msgid "Whether to play a sound to notify of events."
+msgstr "ما إذا سيشغل صوت للتنبيه عن الأحداث."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound when a contact logs in"
-msgstr "_شغل صوت عندما يسجل الدخول أحد جهات الإتصال"
+msgid "Disable sounds when away"
+msgstr "عطل الأصوات عندما أكون بعيدًا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs out"
-msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ما إذا سيشغل صوت عندما أكون بعيدا أو مشغولا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when we log in"
-msgstr "شغل صوت عندما ألج"
+msgid "Play a sound for incoming messages"
+msgstr "شغل صوت عند وصول الرسائل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log out"
-msgstr "شغل صوت عندما أخرج"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ما إذا سيشغل صوت عند وصول الرسائل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+msgid "Play a sound for outgoing messages"
+msgstr "شغل صوت عند إرسال الرسائل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications when a contact logs in"
-msgstr "أظهر تنبيهات منبثقة عند ولوج المتراسل"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ما إذا سيشغل صوت عند إرسال الرسائل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs out"
-msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
+msgid "Play a sound for new conversations"
+msgstr "شغل صوت للمحادثات الجديدة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Show avatars"
-msgstr "أعرض الصور الشخصية"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ما إذا سيشغل صوت للمحادثات الجديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show contact list in rooms"
-msgstr "أظهر قائمة المتراسلين �ي الغر�"
+msgid "Play a sound when a contact logs in"
+msgstr "شغل صوت عندما يسجل الدخول أحد جهات الاتصال"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show hint about closing the main window"
-msgstr "أظهر تلميحة إغلاق النا�ذة الرئيسية"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ما إذا سيشغل صوت عند ولوج متراسل إلى الشبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show offline contacts"
-msgstr "أظهر المتراسلين غير المتَّصلين"
+msgid "Play a sound when a contact logs out"
+msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show protocols"
-msgstr "أظهر البروتوكولات"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ما إذا سيشغل صوت عند خروج متراسل من الشبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Spell checking languages"
-msgstr "لغات التدقيق اللغوي"
+msgid "Play a sound when we log in"
+msgstr "شغل صوت عندما ألج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "The default folder to save file transfers in."
-msgstr "المجلد المبدئي لح�ظ المل�ات المنقولة �يه."
+msgid "Whether to play a sound when logging into a network."
+msgstr "ما إذا سيشغل صوت عند الولوج إلى شبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "The last directory that an avatar image was chosen from."
-msgstr "آخر مجلد اخت�يرت منه الصورة الشخصية."
+msgid "Play a sound when we log out"
+msgstr "شغل صوت عندما أخرج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The position for the chat window side pane"
-msgstr "موضع اللوحة الجانبية �ي نا�ذة الدردشة"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ما إذا سيشغل صوت عند الخروج من شبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "الموضع المح�وظ (بالبكسل) للّوحة الجانبية �ي نا�ذة الدردشة."
+msgid "Enable popup notifications for new messages"
+msgstr "�عّل التنبيهات المنبثقة للرسائل الجديدة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "الس�مة المستخدمة لعرض المحادثة �ي نوا�ذ الدردشة."
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Use graphical smileys"
-msgstr "استخدم التعابير المرسومة"
+msgid "Disable popup notifications when away"
+msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدًا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Use notification sounds"
-msgstr "استخدم أصوات التبليغ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ما إذا ستظهر التنبيهات عندما أكون بعيدا أو مشغولا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Use theme for chat rooms"
-msgstr "استخدم سمة لغر� الدردشة"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "�يما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة حتى إذا كانت الدردشة م�توحة "
+"بال�عل لكن ليست �ي البؤرة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "�يما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
+msgid "Pop up notifications when a contact logs in"
+msgstr "أظهر تنبيهات منبثقة عند ولوج المتراسل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "�يما إذا كان إمبثي سيستخدم شبكة الهات� المحمول لتخمين المكان."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل على الخط."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "�يما إذا كان إمبثي سيستخدم الشبكة لتخمين المكان."
+msgid "Pop up notifications when a contact logs out"
+msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "�يما إذا كان إمبثي رحّل سجلات butterfly."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل غير متصل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "�يما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
+msgid "Use graphical smileys"
+msgstr "استخدم التعابير المرسومة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "�يما إذا كان على إمبثي الانتقال إلى حالة بعيد تلقائيا عند السكون."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "�يما إذا يحول الابتسامات إلى صور معبّرة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "�يما إذا كان على إمبثي خ�ض دقة تحديد المكان للح�اظ على الخصوصية."
+msgid "Show contact list in rooms"
+msgstr "أظهر قائمة المتراسلين �ي الغر�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "�يما إذا كان على إمبثي استخدام أ�اتر المتراسل كأيقونة لنا�ذة المحادثة."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "عرض قائمة المتراسلين �ي غر� المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "�يما إذاكانت أدوات و�ب‌ك�ت للمطور -مثل �احص الوب- ست�عّل أم لا."
+msgid "Chat window theme"
+msgstr "سمة نا�ذة المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "�يما إذا يستخدم مدراء الشبكة لقطع الاتصال أو استرجاعه."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "الس�مة المستخدمة لعرض المحادثة �ي نوا�ذ الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "�يما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
+msgid "Chat window theme variant"
+msgstr "شكل س�مة نا�ذة الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "�يما إذا يحول الابتسامات إلى صور معبّرة."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "شكل السمة المستخدمة لعرض المحادثة �ي نوا�ذ الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ما إذا سيشغل صوت عند ولوج متراسل إلى الشبكة."
+msgid "Path of the Adium theme to use"
+msgstr "مسار سمة Adium لتستخدم"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ما إذا سيشغل صوت عند خروج متراسل من الشبكة."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "مسار سمة Adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to play a sound to notify of events."
-msgstr "ما إذا سيشغل صوت للتنبيه عن الأحداث."
+msgid "Enable WebKit Developer Tools"
+msgstr "�عّل أدوات وب‌ك�ت للمطورين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ما إذا سيشغل صوت عند وصول الرسائل."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "�يما إذاكانت أدوات و�ب‌ك�ت للمطور -مثل �احص الوب- ست�عّل أم لا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ما إذا سيشغل صوت للمحادثات الجديدة."
+msgid "Inform other users when you are typing to them"
+msgstr "أعل�م الم�ستخدمين الآخرين عندما تكتب لهم"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ما إذا سيشغل صوت عند إرسال الرسائل."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound when logging into a network."
-msgstr "ما إذا سيشغل صوت عند الولوج إلى شبكة."
+msgid "Use theme for chat rooms"
+msgstr "استخدم سمة لغر� الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ما إذا سيشغل صوت عند الخروج من شبكة."
+msgid "Whether to use the theme for chat rooms."
+msgstr "استخدام سمة لغر� المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ما إذا سيشغل صوت عندما أكون بعيدا أو مشغولا."
+msgid "Spell checking languages"
+msgstr "لغات التدقيق اللغوي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل غير متصل."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "قائمة لغات التدقيق الإملائي (ا�صل ب�اصلة، مثال: \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل على الخط."
+msgid "Enable spell checker"
+msgstr "مكّن التدقيق الإملائي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة حتى إذا كانت الدردشة م�توحة "
-"بال�عل لكن ليست �ي البؤرة."
+"Whether to check words typed against the languages you want to check with."
+msgstr "�يما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة."
+msgid "Nick completed character"
+msgstr "م�حر� الكنية التام"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "إظهار صور شخصية للمتراسلين �ي لائحة المتراسلين ونوا�ذ المحادثة."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"الم�حر� الذي يجب إضا�ته بعد الأسماء عند استعمال (Tab) لتكملة الأسماء �ي "
+"المحادثات الجماعية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "عرض المرسلين غير المتصلين �ي لائحة المتراسلين."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنا�ذة المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ما إذا ستظهر التنبيهات عندما أكون بعيدا أو مشغولا."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "�يما إذا كان على إمبثي استخدام أ�اتر المتراسل كأيقونة لنا�ذة المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ما إذا ست�عرض بروتوكولات المتراسلين �ي القائمة."
+msgid "Last account selected in Join Room dialog"
+msgstr "آخر حساب تم تحديده �ي مربع حوار انضم لغر�ة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show the contact list in chat rooms."
-msgstr "عرض قائمة المتراسلين �ي غر� المحادثة."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show the contact list in compact mode."
-msgstr "عرض قائمة المتراسلين �ي شكلها المختصر."
+msgid "Camera device"
+msgstr "جهاز الكاميرا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"جهاز الكاميرا الا�تراضي الذي سيستخدم �ي مكالمات ال�يديو، مثال ‎/dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Camera position"
+msgstr "موضع الكاميرا"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Position the camera preview should be during a call."
+msgstr "ينبغي أن يضبط موضع معاينة الكاميرا أثناء المكالمة."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Echo cancellation support"
+msgstr "دعم إلغاء الصدى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "لتمكين �لتر Pulseaudio لإلغاء الصدى."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Show hint about closing the main window"
+msgstr "أظهر تلميح إغلاق النا�ذة الرئيسية"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -418,234 +465,270 @@ msgstr ""
 "عرض حوار الرسائل حول إغلاق النا�ذة الرئيسية التي بها علامة الإغلاق �ي شريط "
 "العناوين."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to use the theme for chat rooms."
-msgstr "استخدام سمة لغر� المحادثة."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "يستطيع إمبثي نشر مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"المعيار المطلوب استخدامه ل�رز لائحة المتراسلين. الم�ترض  ال�رز حسب اسم "
-"المتراسل. يمكن أيضا استخدام معيار الحالة لل�رز حسب حالة المتراسلين."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "�يما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
-msgid "Messaging and VoIP Accounts"
-msgstr "حسابات التراسل"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "�يما إذا كان إمبثي سيستخدم الشبكة لتخمين المكان."
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
-msgstr "تم نقل المل� لكن المل� كان تال�ا"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "يستطيع إمبثي استخدام شبكة الهات� المحمول لتخمين مكان المستخدم"
 
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "لا يدعم المتراسل البعيد نقل المل�ات"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "�يما إذا كان إمبثي سيستخدم شبكة الهات� المحمول لتخمين المكان."
 
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "المل� المختار ليس مل�ا اعتياديا"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
 
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "المل� المختار �ارغ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "�يما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "على إمبثي تقليل دقة تحديد المكان"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "نوع المقبس غير مدعوم"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "�يما إذا كان على إمبثي خ�ض دقة تحديد المكان للح�اظ على الخصوصية."
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "ر�ض تغيير الحالة"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "أنت ألغيت نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "الشخص الآخر قام بإلغاء نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "حدثت مشكلة أثناء محاولة نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "الشخص الآخر غير قادر على نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "تم نقل المل� لكن المل� كان تال�ا"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "لا يدعم المتراسل البعيد نقل المل�ات"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "المل� المختار ليس مل�ا اعتياديا"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "المل� المختار �ارغ"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#, c-format
+msgid "Missed call from %s"
+msgstr "مكالمة �ائتة م�ن %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "تم الاتصال بـ %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "مكالمة م�ن %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "موجود"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "غائب"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "خ�ي"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "غير متصل"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "الحالة محددة على غير متصل."
+msgstr "الحالة محددة على غير متصل"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "خطأ شبكي"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�شل التحقق"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "خطأ �ي التعمية"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "الاسم مستخدم مسبقا"
+msgstr "الاسم مستخدم مسبقًا"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "الشهادة غير متو�رة"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "الشهادة غير موثوق بها"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
-msgstr "انتهت صلاحية الشهادة"
+msgstr "الشهادة منتهية الصلاحية"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "الشهادة غير نشطة"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "عدم تطابق الشهادة مع اسم الخادوم"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "عدم تطابق الشهادة مع التوقيع"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "شهادة موقعة ذاتيا"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "خطأ �ي الشهادة"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "التعمية غير متاحة"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "الشّهادة ليست صالحة"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "ر���ض الاتصال"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
-msgstr "تعذّر بناء الاتصال"
+msgstr "تعذّر تأسيس الاتصال"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "��ق�د الاتصال"
 
-#: ../libempathy/empathy-utils.c:424
-msgid "This resource is already connected to the server"
-msgstr "هذا المورد متصل مسبقا بالخادوم"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "هذا الحساب متصل حاليًا بالخادوم"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "استبدل الاتصال باتصال جديد باستخدام ن�س المور�د"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "الحساب موجود مسبقا على الخادوم"
+msgstr "الحساب موجود مسبقًا على الخادوم"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
-msgstr "الحاسوب مشغول حاليا ولا يستطيع التعامل مع الاتصال"
+msgstr "الخادوم مشغول حاليًا ولا يستطيع التعامل مع الاتصال"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ن�ق�ضت الشهادة"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "تستخدم الشهادة خوارزمية تعمية غير آمنة أو ضعي�ة"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"طول شهادة الخادوم أو عمق شبكة شهادة الخادوم تتجاوز الحد الذي ت�رضه مكتبة "
-"التعمية."
+"طول شهادة الخادوم أو طول سلسلة الشهادات الخادوم تتجاوز الحد الذي ت�رضه مكتبة "
+"التعمية"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "برنامجك قديم جدًا"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "خطأ داخلي"
 
-#: ../libempathy/empathy-utils.c:601
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "الأشخاص القريبون"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ياهو! اليابان"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "جوجل توك"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "دردشة �يسبوك"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -656,7 +739,7 @@ msgstr[3] "منذ %d ثوان"
 msgstr[4] "منذ %d ثانية"
 msgstr[5] "منذ %d ثانية"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -667,7 +750,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -678,7 +761,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -689,7 +772,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -700,7 +783,7 @@ msgstr[3] "منذ %d أسابيع"
 msgstr[4] "منذ %d أسبوعا"
 msgstr[5] "منذ %d أسبوع"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -711,19 +794,18 @@ msgstr[3] "منذ %d أشهر"
 msgstr[4] "منذ %d شهرا"
 msgstr[5] "منذ %d شهر"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "�ي المستقبل"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "الكل"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "كل الحسابات"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
-#: ../src/empathy-import-widget.c:321
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
-msgstr "حساب"
+msgstr "الحساب"
 
 #: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
@@ -739,307 +821,258 @@ msgstr "الخادوم"
 msgid "Port"
 msgstr "المن�ذ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "ي�حرر الحساب %s �ي \"حسابات الوب\"."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1172
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "لا يمكن تحرير الحساب %s �ي إمبثي."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "Launch My Web Accounts"
-msgstr "شغّل \"حسابات الوب\""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_طبّق"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_ل�ج"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "الحساب:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_م�عّل"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "هذا الحساب موجود مسبقا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "أنشئ حسابا جديدا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
-msgid "Ca_ncel"
-msgstr "أ_لغ�"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "�%1$s على %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "حساب %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "حساب جديد"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>مثال:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "كلمة ال_سر:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "متقدم"
+msgid "Screen _Name:"
+msgstr "الاسم الم_عروض:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>مثال:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "كلمة ال_سر:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "تذكّر كلمة السر"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Remember Password"
-msgstr "تذكر كلمة السر"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ال_منْ�ذ:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "تذكّر كلمة السر"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "الاسم الم_عروض:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "ال_خادوم:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "ما كلمة سرك على AIM؟"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "متقدم"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ما اسم الشاشة �ي AIM؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ال_منْ�ذ:"
+msgid "What is your AIM password?"
+msgstr "ما كلمة سرك على AIM؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "ال_خادوم:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>مثال:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "تذكر كلمة السر"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ا_سم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>مثال:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "ما معرّ�ك على GroupWise؟"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "ما كلمة سرك على GroupWise؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>مثال:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ال_ترمير:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ما معر�ك على ICQ؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ما كلمة سرك على ICQ؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "تلقائي"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "سجّل"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "الخيارات"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "لا شيء"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "الترمير:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "الشبكة"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "الشبكة:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "الترمير:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "الخواديم"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"معظم خواديم IRC لا تحتاج كلمة مرور، لذا إذا لم تكن متأكدًا، لا ت�دخل كلمة مرور."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "الاسم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "رسالة الخروج:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "الاسم الحقيقي:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "الخواديم"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "أي شبكة IRC؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "What is your IRC nickname?"
 msgstr "ما كنية IRC التي تستخدمها؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "أي شبكة IRC؟"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>مثال:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>مثال:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ال_تعمية مطلوبة (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_تجاهل أخطاء شهادة SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "تجاوز إعدادات الخادوم"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "الأو_لويّة:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "الم_ورد:"
+msgid "What is your Facebook username?"
+msgstr "ما اسم مستخدمك على �يسبوك؟"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1051,192 +1084,233 @@ msgstr ""
 "استخدم <a href=\"http://www.facebook.com/username/\">هذه الص�حة</a> لاختيار "
 "اسم مستخدم على �يسبوك إذا لم يكن لك واحد."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "استعمل SS_L القديم"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "ما كلمة سرك على �يسبوك؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "ما اسم مستخدمك على �يسبوك؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "ما معر�ك على جوجل؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>مثال:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "ما كلمة سرك على جوجل؟"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>مثال:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_تجاهل أخطاء شهادة SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "الأو_لويّة:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "الم_ورد:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ال_تعمية مطلوبة (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "استعمل SS_L القديم"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "تجاوز إعدادات الخادوم"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ما معر�ك على جاب�ر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "ما كلمة سرك على جاب�ر؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ما المعر� الذي تريده على جاب�ر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "ما كلمة سرك على جاب�ر؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ما كلمة السر التي تريدها على جاب�ر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>مثال:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "ما معرّ�ك على Windows Live؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "ما كلمة سرك على Windows Live؟"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_عنوان البريد:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "الا_سم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "الاسم ال_عائلي:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "الا_سم الأول:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "الا_سم المنشور:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "معرّ� _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "الاسم ال_عائلي:"
+msgid "E-_mail address:"
+msgstr "_عنوان البريد:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "الا_سم المنشور:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "اسم المست_خدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>مثال:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "اسم مستخدم الاستيثاق:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "اكتش� الارتباط"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "اكتش� خادوم STUN تلقائيا"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "استخدم هذا الحساب للاتصال بالهوات� الأر_ضية والهوات� الخليوية"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "المدة (بالثواني)"
+msgid "NAT Traversal Options"
+msgstr "خيارات انتقال NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
-msgstr "خيارات إبقاء الاتصال"
+msgid "Proxy Options"
+msgstr "خيارات الوسيط"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr "توجيه متراخي"
+msgid "Miscellaneous Options"
+msgstr "خيارات متنوعة"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
-msgstr "الآلية:"
+msgid "STUN Server:"
+msgstr "خادوم STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Miscellaneous Options"
-msgstr "خيارات متنوعة"
+msgid "Discover the STUN server automatically"
+msgstr "اكتش� خادوم STUN تلقائيا"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "NAT Traversal Options"
-msgstr "خيارات انتقال NAT"
+msgid "Discover Binding"
+msgstr "اكتش� الارتباط"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "الخادوم:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Port:"
-msgstr "المنْ�ذ:"
+msgid "Keep-Alive Options"
+msgstr "خيارات إبقاء الاتصال"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Proxy Options"
-msgstr "خيارات الوسيط"
+msgid "Mechanism:"
+msgstr "الآلية:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "المدة (بالثواني)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "اسم مستخدم الاستيثاق:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "STUN Server:"
-msgstr "خادوم STUN:"
+msgid "Transport:"
+msgstr "النقل:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Server:"
-msgstr "الخادوم:"
+msgid "Loose Routing"
+msgstr "توجيه متراخي"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Transport:"
-msgstr "النقل:"
+msgid "Ignore TLS Errors"
+msgstr "تجاهل أخطاء TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "What is your SIP account password?"
-msgstr "ما كلمة سر حسابك على SIP؟"
+msgid "Port:"
+msgstr "المنْ�ذ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP login ID?"
 msgstr "ما معر� ولوجك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "_Username:"
-msgstr "اسم المست_خدم:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "ما كلمة سر حسابك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "م�عرّ� _ياهو!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_تجاهل دعوات المؤتمرات وغر� الدردشة"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "محلية لائحة ال_غر�:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ما معر�ك على ياهو!؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ما كلمة سرك على ياهو!؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "م�عرّ� _ياهو"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "محلية لائحة ال_غر�:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "تعذّر تحويل الصورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ولا واحدة من المصور المقبولة مدعومة �ي نظامك"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "تعذّر ح�ظ الصورة إلى مل�"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "اختر صورتك الشخصية"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "التقط صورة..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "لا صورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "صور"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "كل المل�ّات"
 
@@ -1244,43 +1318,73 @@ msgstr "كل المل�ّات"
 msgid "Click to enlarge"
 msgstr "انقر للتكبير"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "حدث خطأ أثناء بدء المكالمة"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "المتراسل المحدد لا يدعم المكالمات"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "المتراسل المحدد غير متصل"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "المتراسل المحدد غير صالح"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "مكالمات الطوارئ غير مدعومة على هذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "ليس لديك رصيدٌ كا�� لإجراء هذه المكالمة"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�شل �تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "الموضوع غير مدعوم �ي هذه المحادثة"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "لا ي�سمح لك بتغيير الموضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:991
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� هو معرّ� متراسل غير صالح"
+
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 "/clear:\n"
 "يمسح كل الرسائل من المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 "/topic <موضوع>:\n"
 "يحدد موضوع المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <معرّ� غر�ة دردشة>:\n"
 "انضم إلى غر�ة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <معرّ� غر�ة دردشة>:\n"
 "انضم إلى غر�ة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1288,31 +1392,31 @@ msgstr ""
 "/part [<معرّ� غر�ة دردشة>] ‎[<سبب>]:\n"
 "غادر غر�ة الدردشة، الحالية إذا لم يحدد غيرها"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <معرّ� متراسل>‎ [<رسالة>]:\n"
 "ا�تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <معرّ� متراسل>‎ <رسالة>:\n"
 "ا�تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 "/nick <اسم مستعار>:\n"
 "غيّر اسمك المستعار على الخادوم الحالي"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <رسالة>:\n"
 "يرسل رسالة إجراء إلى المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1322,7 +1426,11 @@ msgstr ""
 "يرسل <رسالة> إلى المحادثة الحالية. يستخدم هذا لإرسال رسالة تبدأ بشرطة مائلة "
 "'/'. مثلا: \"‪/say /join‬ تستخدم للانضمام إلى غر�ة دردشة جديدة\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1120
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: عرض معلومات حول متراسل"
+
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1330,111 +1438,139 @@ msgstr ""
 "/help [<أمر>]:\n"
 "اعرض كل الأوامر المدعومة. إذا كان <أمر> �سيعرض كي�ية استخدامه."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "الاستخدام: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "أمرٌ مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "أمرٌ مجهول؛ راجع ‪/help‬ لتعر� الأوامر المتاحة"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#: ../libempathy-gtk/empathy-chat.c:1564
+msgid "insufficient balance to send message"
+msgstr "الرصيد غير كا�� لإرسال رسالة"
+
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "خطأ �ي ارسال الرسالة '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "خطأ �ي إرسال الرسالة: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "رصيد غير كا�� لإرسال رسالة. <a href='%s'>اشحن</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
+msgid "not capable"
+msgstr "غير قابل للتطبيق"
+
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "غير متّصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "متراسل غير صحيح"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "ر��ض التّصريح"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "الرسالة طويلة جدا"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "غير مطبق"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "خطأ �ي ارسال الرسالة '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "الموضوع:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "الموضوع: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "عيّن %s الموضوع: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "لم يحدد أي موضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(لا اقتراحات)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "أض�� '%s' إلى القاموس"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "أض�� '%s' إلى قاموس %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "أدرج التعابير المرسومة"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "أ_رسل"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "ا_قتراحات الإملاء"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�شل جلب السجلات الحديثة"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
-msgstr "�%s قطع الاتصال"
+msgstr "�ق�طع الاتصال ب\"%s\""
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�طرد %1$s�  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s ط�ر�د"
@@ -1442,17 +1578,17 @@ msgstr "�%s ط�ر�د"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "حظر  %1$s�  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "�%s ح�ظ�ر"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s غادر الغر�ة"
@@ -1462,141 +1598,163 @@ msgstr "�%s غادر الغر�ة"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr "�� (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "انضم %s إلى الغر�ة"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "يعر� %s الآن باسم %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "غير متَصل"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "أترغب �ي ح�ظ كلمة السر هذه؟"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "تذكّر"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ليس الآن"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "كلمة سر خطأ؛ من �ضلك أعد المحاولة:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "هذه الغر�ة محمية بكلمة سر:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "انضم"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "محادثة"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4130
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "معرّ� غير معرو� أو غير سليم"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "منع المتراسلين غير متاح مؤقتا"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "منع المتراسلين غير متاح"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ر���ض الإذن"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "تعذّر منع المتراس�ل"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "حرّر المتراسلين الممنوعين"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "الحساب:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "المتراسلين الممنوعين"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "إزالة"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ا_نسخ عنوان الوصلة"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ا_�تح الوصلة"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "عدّل معلومات المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "المعلومات الشخصية"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "متراسل جديد"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "أأمنع %s؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "أمتأكد أنك تريد منع '%s' من مراسلتك مرة أخرى؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ا_منع"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "أ_بلع عن أن هذا المتراسل مؤذ�"
@@ -1607,371 +1765,315 @@ msgstr[4] "أ_بلع عن أن هؤلاء المتراسلين مؤذين"
 msgstr[5] "أ_بلع عن أن هؤلاء المتراسلين مؤذين"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_سأقرر لاحقًا"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "طلب تسجيل"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ا_منع المستخدم"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "غير مجمّع"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "الأشخاص الم�ضّلين"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
-msgid "Removing group"
-msgstr "إزالة مجموعة"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "أ_زل"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-msgid "Removing contact"
-msgstr "حذ� المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Add Contact…"
-msgstr "أ_ض� متراسلا…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-msgid "_Block Contact"
-msgstr "ا_منع المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Chat"
-msgstr "_دردشة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_مكالمة صوتية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_مكالمة مرئية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Previous Conversations"
-msgstr "المحادثات ال_سابقة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
-msgid "Send File"
-msgstr "أرسل مل�ا"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
-msgid "Share My Desktop"
-msgstr "شارك سطح مكتبي"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "م�ضّل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
-msgid "Infor_mation"
-msgstr "_معلومات"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_حرّر"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
-msgid "Inviting you to this room"
-msgstr "يدعوك إلى هذه الغر�ة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
-msgid "_Invite to Chat Room"
-msgstr "ا_دع إلى غر�ة المحادثة"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_سأقرر لاحقًا"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ابحث عن المتراسلين"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "ابحث:"
+msgstr "ابحث: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "أ_ض� متراسلا"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "لم ي�عثَر على متراسلين"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "حدد متراسلا"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:295
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "الاسم الكامل:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:296
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "رقم الهات�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:297
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "عنوان البريد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:298
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "موقع الإنترنت:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:299
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "يوم الميلاد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "رسالتك لتقديم ن�سك:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "الرجاء دعني أرى عندما تكون متصلًا. شكرًا!"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "القنوات:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "رمز البلد"
+msgstr "رمز البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "الولاية:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "المدينة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "المنطقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "الرمز البريدي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "الشارع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "المبنى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "الطابق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "الغر�ة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "النص:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "الوص�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "المسار:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "مستوى الدقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "خطأ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "خطأ رأسي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "خطأ أ�قي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "السرعة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "الطريقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "سرعة التسلّق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "آخر تحديث:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "خط الطول:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "دائرة العرض:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "الارت�اع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "المكان"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "�%s، �%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B، %Y �ي %R ت‌ع‌م"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "اح�ظ الصور الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "لا يمكن ح�ظ الصورة الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>المكان</b> �ي (تاريخ)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
-msgid "Alias:"
-msgstr "الكنية:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "معلومات العميل"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "العميل:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "الت�اصيل الشخصية"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "ت�اصيل المتراسل"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "رقم الهات�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "موقع الويب"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "الميلاد"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "آخر ظهور:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "متصل من:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "رسالة الغياب:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "صوت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "الم�ضّل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "البريدي"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "الطرد"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "المعر�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "الكنية:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>المكان</b> �ي (تاريخ)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "معلومات مطلوبة…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "معلومات العميل"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "نظام التشغيل:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "الإصدارة:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "العميل:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "المجموعات"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1979,21 +2081,21 @@ msgstr ""
 "انتق� المجموعات التي تود أن يظهر �يها هذا المتراسل، يمكنك انتقاء أكثر من "
 "مجموعة أو لا مجموعة."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "أ_ض� مجموعة"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "حدّد"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "المعر�ّات التالية ست�منع:"
@@ -2003,7 +2105,7 @@ msgstr[3] "المعر�ّات التالية ست�منع:"
 msgstr[4] "المعر�ّات التالية ست�منع:"
 msgstr[5] "المعر�ّات التالية ست�منع:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "المعر�ّات التالية لن ت�منع:"
@@ -2013,48 +2115,141 @@ msgstr[3] "المعر�ّات التالية لن ت�منع:"
 msgstr[4] "المعر�ّات التالية لن ت�منع:"
 msgstr[5] "المعر�ّات التالية لن ت�منع:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-msgid "Linked Contacts"
-msgstr "المتراسلين المترابطين"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-msgid "Select contacts to link"
-msgstr "حدد متراسلا لربطه"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-msgid "New contact preview"
-msgstr "معاينة متراسل جديد"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:472
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "المتراسلين المحددين �ي القائمة على اليمين سيربطون إلى بعضهم البعض."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "عدّل معلومات المتراسل"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "�%s �(%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "حدد حسابًا ليستخدم لبدء المكالمة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "اتصل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ا_منع المتراسل"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_دردشة"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_مكالمة صوتية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_مكالمة مرئية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "المحادثات ال_سابقة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "أرسل مل�ا"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "شارك سطح مكتبي"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "م�ضّل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "�gnome-contacts غير مثبّت"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "رجاءً ثبّت gnome-contacts للوصول لت�اصيل المتراسلين."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_معلومات"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_حرر"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ا_ربط المتراسلين…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "يدعوك إلى هذه الغر�ة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "ا_دع إلى غر�ة المحادثة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "أ_ض� متراسلا…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "احذ� وا_منع"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "إزالة مجموعة"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "أ_زل"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2063,38 +2258,42 @@ msgstr ""
 "أتريد حقا حذ� المتراسل المرتبط '%s'؟ لاحظ أن هذا سيحذ� كل المتراسلين التي "
 "يتشكل منها."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "حذ� المتراسل"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "متراسل مرتبط لا يحتوي أي متراسلين"
-msgstr[1] "متراسل مرتبط يحتوي متراسل واحد"
-msgstr[2] "متراسل مرتبط يحتوي متراسليْن"
-msgstr[3] "متراسل مرتبط يحتوي %u متراسلين"
-msgstr[4] "متراسل مرتبط يحتوي %u متراسلا"
-msgstr[5] "متراسل مرتبط يحتوي %u متراسل"
+msgstr[0] "متراسل مرتبط لا يحوي أي مراسلين"
+msgstr[1] "متراسل مرتبط يحوي مراسلا واحدا"
+msgstr[2] "متراسل مرتبط يحوي مراسليْن"
+msgstr[3] "متراسل مرتبط يحوي %u مراسلين"
+msgstr[4] "متراسل مرتبط يحوي %u مراسلا"
+msgstr[5] "متراسل مرتبط يحوي %u مراسل"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>المكان</b> �ي (تاريخ)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "متصل من هات� محمول أو جهاز نقال آخر"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "شبكة جديدة"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "اختر شبكة IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "ص�ّ�ر قائمة ال_شبكات"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "اختر"
@@ -2107,112 +2306,258 @@ msgstr "خادوم جديد"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "اربط المتراسلين"
+#: ../libempathy-gtk/empathy-log-window.c:620
+msgid "History"
+msgstr "التأريخ"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ا_�صل…"
+#: ../libempathy-gtk/empathy-log-window.c:675
+msgid "Show"
+msgstr "أعرض"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "ا�صل المتراسل المرتبط المعروض إلى متراسلين من�صلين."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ار_بط"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-log-window.c:697
+msgid "Search"
+msgstr "ابحث"
+
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "أأ�صل المتراسلين المرتبطين '%s'؟"
+msgid "Chat in %s"
+msgstr "دردشة �ي %s"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"أمتأكد من رغبتك �ي �صل هؤلاء المتراسلين المرتبطين؟ هذا سي�صل المتراسلين "
-"المرتبطين إلى كل على حدة."
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat with %s"
+msgstr "دردشة مع %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1289
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1295
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "ثانية"
+msgstr[1] "منذ ثانية واحدة"
+msgstr[2] "منذ ثانيتين"
+msgstr[3] "منذ %s ثوان"
+msgstr[4] "منذ %s ثانية"
+msgstr[5] "منذ %s ثانية"
+
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "دقيقة"
+msgstr[1] "منذ دقيقة واحدة"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %s دقائق"
+msgstr[4] "منذ %s دقيقة"
+msgstr[5] "منذ %s دقيقة"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "المكالمة استغرقت %s، انتهت �ي %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1720
+msgid "Today"
+msgstr "اليوم"
+
+#: ../libempathy-gtk/empathy-log-window.c:1724
+msgid "Yesterday"
+msgstr "بالأمس"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
+msgid "Anytime"
+msgstr "أي وقت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
+msgid "Anyone"
+msgstr "أي شخص"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ا_�صل"
+#: ../libempathy-gtk/empathy-log-window.c:2713
+msgid "Who"
+msgstr "من"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "التاريخ"
+#: ../libempathy-gtk/empathy-log-window.c:2922
+msgid "When"
+msgstr "متى"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "Anything"
+msgstr "أي شيء"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Text chats"
+msgstr "دردشات نصية"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "مكلمات"
+
+#: ../libempathy-gtk/empathy-log-window.c:3047
+msgid "Incoming calls"
+msgstr "مكالمات واردة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3048
+msgid "Outgoing calls"
+msgstr "مكالمات صادرة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Missed calls"
+msgstr "مكالمات �ائتة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3071
+msgid "What"
+msgstr "ماذا"
+
+#: ../libempathy-gtk/empathy-log-window.c:3780
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "هل أنت متأكد بأنك تريد حذ� جميع سجلات المحادثات السابقة؟"
+
+#: ../libempathy-gtk/empathy-log-window.c:3784
+msgid "Clear All"
+msgstr "مسح الكل"
+
+#: ../libempathy-gtk/empathy-log-window.c:3791
+msgid "Delete from:"
+msgstr "حذ� من:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_مل�"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "محادثات"
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "ت_حرير"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "ابحث عن التالي"
+msgid "Delete All History..."
+msgstr "حذ� كل التاريخ..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "ابحث عن السابق"
+msgid "Profile"
+msgstr "ص�حة شخصية"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "المحادثات السابقة"
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "محادثة"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "ابحث"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "�ديو"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "ص�حة 2"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_عن:"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">جار التحميل...</span>"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "معرّ� المتراسل:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "المتراسل غير متّصل"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
-msgid "C_hat"
-msgstr "ا_بدأ محادثة"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "المتراسل المحدد إما غير صالح أو مجهول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "المتراسل لايدعم هذا النوع من المحادثة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "الوظي�ة المطلوبة غير مجهزّة لهذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "تعذر بدء محادثة مع المتراسل المحدد"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "أنت ممنوع �ي هذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "هذه القناة ممتلئة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "لا ب�د أن تكون مدعوًا لكي تنضم لهذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "لا يمكن المتابعة خلال انقطاع الاتصال"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "ر��ض التّصريح"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "حدث خطأ أثناء بدء المحادثة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "أدخل م�عرّ�� المتراسل أو رقم الهات�:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "محادثة جديدة"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
-msgid "Send _Video"
-msgstr "أرسل _�يديو"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "مكالمة مرئ_ية"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-msgid "C_all"
-msgstr "ا_تصل"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "مكالمة صو_تية"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "مكالمة جديدة"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "�َش�ل الاستيثاق للحساب <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2227,34 +2572,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "رسالة مخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "حرر الرسائل المخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "انقر لإزالة كون هذه الحالة هي الم�ضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "انقر لجعل هذه الحالة هي الم�ضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "حدد الحالة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "حدد تواجدك وحالتك الحالية"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "الرسائل المخصصة…"
 
@@ -2262,18 +2603,26 @@ msgstr "الرسائل المخصصة…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "حساب %s جديد"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "ابحث:"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "ال_سابق"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "ال_تالي"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "طاب�ق حالة الأحر�"
+msgid "Mat_ch case"
+msgstr "_طابق حالة الأحر�"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
@@ -2297,7 +2646,7 @@ msgstr "اتصل المتراسل"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr "قطع المتراسل اتصاله"
+msgstr "ق�طع الاتصال بالمتراسل"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
@@ -2319,35 +2668,32 @@ msgstr "مكالمة صوتية صادرة"
 msgid "Voice call ended"
 msgstr "أنهيت المكالمة الصوتية"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "حرر الرسالة المخصّصة"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "حرر الرسائل المخصّصة"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "اح�ظ رسالة _حالة جديدة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "ح�ر�رَت الرسالة �ي %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "رسائل الحالة المح�وظة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "عادي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "تقليدي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "بسيط"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "نظي�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "أزرق"
 
@@ -2407,41 +2753,45 @@ msgid "Certificate hostname: %s"
 msgstr "اسم المستضي� �ي الشهادة: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "أكمل"
+msgid "C_ontinue"
+msgstr "أ_كمل"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "اتصال غير موثوق به"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "الاتصال غير موثوق. أتريد المتابعة بغض النظر عن هذا؟"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "تذكر هذا الاختيار للاتصالات المستقبلية"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ت�اصيل الشهادة"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "تعذّر �تح المسار"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "اختر مل�ا"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "لا توجد مساحة خالية ك�اية لح�ظ المل�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "مطلوب %s مساحة خالية لح�ظ المل� لكن لا يتو�ر إلا %s. اختر مكانا آخر."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "مل� وارد من %s"
@@ -2613,39 +2963,31 @@ msgstr "غربي"
 msgid "Vietnamese"
 msgstr "�يتنامي"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "الم�تراسل المحدد لا يستطيع استقبال مل�ات."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "المتراسل المحدد غير متّصل."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "لا رسالة خطأ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "رسالة �ورية (إمبَثي)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "لا تتصل عند بدء التشغيل"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "لا تعرض قائمة المتراسلين أو أي حوارات أخرى عند بدء التشغيل"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- المرسال إمبثي"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "ع�طل أثناء الاتصال بمدير الحسابات"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2686,14 +3028,14 @@ msgid ""
 msgstr ""
 "من الم�ترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج؛ إذا لم يحدث "
 "هذا �اكتب إلى:\n"
-"Free Software Fondation Inc., 59 Temple Place - Suite 330, Boston, MA 02111 "
-"- 1307, USA"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "عميل مراسلة �ورية لجنوم"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "�ريق عربآيز للترجمة http://www.arabeyes.org :\n"
@@ -2703,218 +3045,80 @@ msgstr ""
 "محمد الحبيّ�ب\t<mih1406@gmail.com>\n"
 "خالد حسني\t<khaledhosny@eglug.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "حدث خطأ أثناء استيراد الحسابات."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "حدث خطأ أثناء تحليل ت�اصيل الحساب."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "حدث خطأ أثناء إنشاء الحساب."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "حدث خطأ."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "رسالة الخطأ: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"يمكنك إما العودة للخل� ومحاولة إدخال ت�اصيل الحساب مرة ثانية، أو إغلاق هذا "
-"المساعد وإضا�ة الحساب لاحقا من قائمة \"تحرير\"."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "حدث خطأ"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "ما نوع حساب الدردشة الذي تمتلكه؟"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ألديك حساب دردشة آخر تريد إعداده؟"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "أدخل ت�اصيل الحساب"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "ما نوع حساب الدردشة الذي تريد إنشاءه؟"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "هل تريد إنشاء حسابات دردشة أخرى؟"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "أدخل ت�اصيل الحساب الجديد"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"مع إمبثي تستطيع الدردشة مع أصدقائك وزملائك الذين يستخدمون جوجل توك، أو AIM، "
-"أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكرو�ون وكاميرا "
-"تستطيع إجراء محادثات بالصوت والصورة."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "نعم، استورد معلومات حسابي من "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "نعم، سأ�دخل معلومات حسابي الآن"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "لا، أريد حسابا جديدا"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "لا، حاليا أريد رؤية الأشخاص المتصلين قريبا مني �قط"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "اختر الحسابات التي تريد استيرادها:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
-msgid "Yes"
-msgstr "نعم"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "لا، يك�ي هذا الآن"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"يستطيع إمبثي أن يكتش� تلقائيا وي�تح محادثة مع الأشخاص المتصلين معك على ن�س "
-"الشبكة. إذا أردت استخدام هذه الخاصية �تأكد من أن الت�اصيل أدناه صحيحة. يمكنك "
-"تغيير هذه الت�اصيل بسهولة لاحقا أو حتى تعطيل هذه الخاصية من حوار 'الحسابات'."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "تحرير�الحسابات"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "لا أريد _ت�عيل هذه الخاصية الآن"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"لن تستطيع الدردشة مع الأشخاص المتصلين معك على ن�س الشبكة، لأن telepathy-"
-"salut غير مثبت. إذا أردت ت�عيل هذه الخاصية �من �ضلك ثبّت حزمة telepathy-salut "
-"ثم أنشئ حساب 'أشخاص قريبون' من حوار 'الحسابات"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "�telepathy-salut غير مثبت"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "مساعد حسابات التراسل والصوت عبر الشبكة"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "مرحبا مع إمبثي"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "استورد حساباتك الموجودة"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "من �ضلك أدخل بيانات الشخصية"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "توجد تغييرات غير مح�وظة �ي حساب %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "لم ي�ح�ظ حسابك بعد."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "يتّصل…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "غير متصل — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
-msgstr "قطع الاتصال — %s"
+msgstr "ق�طع الاتصال — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "غير متصل — لا اتصال شبكي"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "حالة مجهول"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"تم تعطيل هذا الحساب لاعتماده على قاعدة قديمة غير مدعومة. رجاءً ثبت telepathy-"
+"haze وأع�د تشغيل الجلسة لترحيل الحساب."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "غير متصل — ع�طّل الحساب"
 
-#: ../src/empathy-accounts-dialog.c:772
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
-"أم�تأكد أنك ترغب �ي إتمام العملية؟"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "تعديل عوامل الاتصال"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "�شل �ي جلب معلوماتك الشخصية من الخادوم."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "اتصل لتعديل معلوماتك الشخصية."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_عدّل عوامل الاتصال..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "هل ترغب بإزالة %s من حاسوبك؟"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "لن يزيل هذا حسابك على الخادوم."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2923,15 +3127,23 @@ msgstr ""
 "أم�تأكد أنك ترغب �ي إتمام العملية؟"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_�عّل"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_عطّل"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_تخطي"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "ات_صل "
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2940,18 +3152,18 @@ msgstr ""
 "أم�تأكد أنك ترغب �ي إتمام العملية؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "يحمّل معلومات الحساب"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "لم يثبّت أي بروتوكول"
+msgid "Add…"
+msgstr "أض�…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Protocol:"
-msgstr "البروتوكول:"
+msgid "_Import…"
+msgstr "ا_ستورد…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "يحمّل معلومات الحساب"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2959,272 +3171,200 @@ msgstr ""
 "لإضا�ة حساب جديد، عليك أولا بتثبيت الخل�ية المناسبة لكل بروتوكول تود "
 "استعماله."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "أ_ض�…"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "ا_ستورد…"
+#, fuzzy
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "لم يثبّت أي بروتوكول"
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - عميل استيثاق إمبثي"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "عميل استيثاق إمبثي"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "مع أصدقاء"
-
-#: ../src/empathy-av.c:118
-msgid "- Empathy Audio/Video Client"
-msgstr "- المرسال إمبثي"
-
-#: ../src/empathy-av.c:134
-msgid "Empathy Audio/Video Client"
-msgstr "المرسال إمبثي"
-
-#: ../src/empathy-streamed-media-window.c:479
-msgid "Contrast"
-msgstr "التباين"
-
-#: ../src/empathy-streamed-media-window.c:482
-msgid "Brightness"
-msgstr "السطوع"
-
-#: ../src/empathy-streamed-media-window.c:485
-msgid "Gamma"
-msgstr "جاما"
-
-#: ../src/empathy-streamed-media-window.c:590
-msgid "Volume"
-msgstr "الحجم"
-
-#: ../src/empathy-streamed-media-window.c:1166
-msgid "_Sidebar"
-msgstr "الشريط ال_جانبي"
-
-#: ../src/empathy-streamed-media-window.c:1186
-msgid "Audio input"
-msgstr "مدخلات الصوت"
-
-#: ../src/empathy-streamed-media-window.c:1190
-msgid "Video input"
-msgstr "مدخلات ال�يديو"
-
-#: ../src/empathy-streamed-media-window.c:1194
-msgid "Dialpad"
-msgstr "لوحة الأرقام"
-
-#: ../src/empathy-streamed-media-window.c:1205
-msgid "Details"
-msgstr "الت�اصيل"
-
-#. translators: Call is a noun and %s is the contact name. This string
-#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
-#, c-format
-msgid "Call with %s"
-msgstr "اتصل باستخدام %s"
-
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "اتصل"
-
-#: ../src/empathy-streamed-media-window.c:1507
-msgid "The IP address as seen by the machine"
-msgstr "رقم الإنترنت كما يراه الجهاز"
-
-#: ../src/empathy-streamed-media-window.c:1509
-msgid "The IP address as seen by a server on the Internet"
-msgstr "رقم الإنترنت كما يراه خادوم على الإنترنت"
-
-#: ../src/empathy-streamed-media-window.c:1511
-msgid "The IP address of the peer as seen by the other side"
-msgstr "رقم الإنترنت للند كما ي�رى على الجانب الآخر"
-
-#: ../src/empathy-streamed-media-window.c:1513
-msgid "The IP address of a relay server"
-msgstr "رقم الإنترنت لخادوم تقوية"
-
-#: ../src/empathy-streamed-media-window.c:1515
-msgid "The IP address of the multicast group"
-msgstr "رقم الإنترنت لمجموعة توصيل متعدد"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "متَصل — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2327
-msgid "Technical Details"
-msgstr "الت�اصيل التقنية"
-
-#: ../src/empathy-streamed-media-window.c:2365
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr "برمجية %s لا ت�هم أيا من أنساق الصوت المدعومة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2370
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr "برمجية %s لا ت�هم أيا من أنساق ال�يديو المدعومة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2376
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"تعذّر إنشاء اتصال مع %s. قد يكون أحدكما �ي شبكة لا تسمح بالاتصالات المباشرة."
-
-#: ../src/empathy-streamed-media-window.c:2382
-msgid "There was a failure on the network"
-msgstr "حدث عطل �ي الشبكة"
-
-#: ../src/empathy-streamed-media-window.c:2386
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "أنساق الصوت المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2389
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "أنساق ال�ديو المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2399
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"حدث أمر غير متوقع �ي مكون تليباثي. من �ضلك <a href=\"%s\">أبلغ عن هذه العلة</"
-"a> وأر�ق السجل المجمع �ي نا�ذة 'نقح' من قائمة 'مساعدة'."
-
-#: ../src/empathy-streamed-media-window.c:2407
-msgid "There was a failure in the call engine"
-msgstr "حدث عطل �ي محرك الاتصالات"
-
-#: ../src/empathy-streamed-media-window.c:2410
-msgid "The end of the stream was reached"
-msgstr "و�ص�ل إلى نهاية الد�ق"
-
-#: ../src/empathy-streamed-media-window.c:2450
-msgid "Can't establish audio stream"
-msgstr "تعذر بناء د�ق الصوت"
-
-#: ../src/empathy-streamed-media-window.c:2460
-msgid "Can't establish video stream"
-msgstr "تعذر بناء د�ق ال�ديو"
-
 #: ../src/empathy-call-window.ui.h:1
-msgid "Audio"
-msgstr "صوت"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "اتصل بالمتراسل ثانيا"
+msgid "_Call"
+msgstr "_اتصال"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "عطل الكمرة"
+msgid "_Microphone"
+msgstr "_الميكرو�ون"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "�عّل الكمرة"
+msgid "_Camera"
+msgstr "_الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "مرماز ال�ك:"
+msgid "_Settings"
+msgstr "إ_عدادات"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "عطل الكمرة وتوق� عن إرسال ال�ديو"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "_عرض"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "�عّل الكمرة وأرسل �ديو"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "م_ساعدة"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "�عّل الكمرة ولا ترسل �ديو"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "الم_حتويات"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "مرماز الترميز:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_نقّح"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "علّق"
+msgid "Swap camera"
+msgstr "تبديل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "علّق المكالمة الحالية"
+msgid "Minimise me"
+msgstr "تصغير"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "المرشح المحلي:"
+msgid "Maximise me"
+msgstr "تكبير"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "معاينة"
+msgid "Disable camera"
+msgstr "عطّل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "أع�د الاتصال"
+msgid "Hang up"
+msgstr "علّق"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "المرشح البعيد:"
+msgid "Hang up current call"
+msgstr "علّق المكالمة الحالية"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "أرسل مل� صوتي"
+msgid "Video call"
+msgstr "مكالمة �يديو"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "بدل نقل الصوت"
+msgid "Start a video call"
+msgstr "ابدأ مكالمة �يديو"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_�ديو"
+msgid "Start an audio call"
+msgstr "ابدأ مكالمة صوتية"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "�ديو"
+msgid "Show dialpad"
+msgstr "أظهر لوح اتصال"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "عطّل ال�ديو"
+msgid "Display the dialpad"
+msgstr "اعرض لوح الاتصال"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "�عّل ال�ديو"
+msgid "Send Video"
+msgstr "إرسال �يديو"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "معاينة ال�يديو"
+msgid "Toggle video transmission"
+msgstr "بدل نقل ال�يديو"
 
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "_اتصال"
+msgid "Send Audio"
+msgstr "أرسل مل� صوتي"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
-msgid "_View"
-msgstr "_عرض"
+#: ../src/empathy-call-window.ui.h:25
+msgid "Toggle audio transmission"
+msgstr "بدل نقل الصوت"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-call-window.ui.h:27
+msgid "Encoding Codec:"
+msgstr "مرماز الترميز:"
+
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538 ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "مجهول"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "مرماز ال�ك:"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "Remote Candidate:"
+msgstr "المرشح البعيد:"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "Local Candidate:"
+msgstr "المرشح المحلي:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "صوت"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "هل تريد غلق هذه النا�ذة؟"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"بإغلاقك لهذه النا�ذة ستغادر الغر�ة %s. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لها م�جددا."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] " "
+msgstr[1] ""
+"بإغلاقك لهذه النا�ذة ستغادر غر�ة واحدة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لها م�جددا."
+msgstr[2] ""
+"بإغلاقك لهذه النا�ذة ستغادر غر�تين. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهما م�جددا."
+msgstr[3] ""
+"بإغلاقك لهذه النا�ذة ستغادر %u غر�. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغر� م�جددا."
+msgstr[4] ""
+"بإغلاقك لهذه النا�ذة ستغادر %u غر�ة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغر� م�جددا."
+msgstr[5] ""
+"بإغلاقك لهذه النا�ذة ستغادر %u غر�ة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغر� م�جددا."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "هل تريد ترك %s؟"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "لن تستقبل المزيد من الرسائل من غر�ة المحادثة هذه حتى تنضم لها م�جددا."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "أغلق النا�ذة"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "غادر الغر�ة"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3235,7 +3375,7 @@ msgstr[3] "%s (%d غير مقروة)"
 msgstr[4] "%s (%d غير مقروة)"
 msgstr[5] "%s (%d غير مقروة)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3246,7 +3386,7 @@ msgstr[3] "%s (و %u أخرى)"
 msgstr[4] "%s (و %u أخرى)"
 msgstr[5] "%s (و %u أخرى)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3257,7 +3397,7 @@ msgstr[3] "%s (%d غير مقروة من الآخرين)"
 msgstr[4] "%s (%d غير مقروة من الآخرين)"
 msgstr[5] "%s (%d غير مقروة من الآخرين)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3268,186 +3408,190 @@ msgstr[3] "%s (%d غير مقروة من الكل)"
 msgstr[4] "%s (%d غير مقروة من الكل)"
 msgstr[5] "%s (%d غير مقروة من الكل)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:892
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:902
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] " "
+msgstr[1] "يرسل رسالة"
+msgstr[2] "يرسل رسالتين"
+msgstr[3] "يرسل %d رسائل"
+msgstr[4] "يرسل %d رسالة"
+msgstr[5] "يرسل %d رسالة"
+
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
-msgstr "يكتب رسالة..."
+msgstr "يكتب رسالة."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "ا_مسح"
+msgid "_Conversation"
+msgstr "م_حادثة"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ا_تصل"
+msgid "C_lear"
+msgstr "ا_مسح"
 
 #: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "محادثة"
-
-#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "أدرج تعبيرا ر_سوميا"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "الغر�ة الم_�ضلة"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "ادع� ال_مشارك…"
+msgid "Notify for All Messages"
+msgstr "أبلغ بكل الرسائل"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "انقل اللّ�سان إلى اليسا_ر"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "أظهر _قائمة المتراسلين"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "انقل اللّ�سان إلى ال_يمين"
+msgid "Invite _Participant…"
+msgstr "ادع� شخصا لهذه ال_محادثة…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "أبلغ بكل الرسائل"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "الم_حتويات"
+msgid "C_ontact"
+msgstr "ا_تصل"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "م_حادثة"
+msgid "_Tabs"
+msgstr "أ_لسنة"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_�صل اللسان"
+msgid "_Previous Tab"
+msgstr "اللسان ال_سابق"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "ت_حرير"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "اللسان ال_تالي"
 
 #: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "الغر�ة الم_�ضلة"
+msgid "_Undo Close Tab"
+msgstr "_تراجع عن غلق اللسان"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "م_ساعدة"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "انقل اللّ�سان إلى اليسا_ر"
 
 #: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "اللسان ال_تالي"
+msgid "Move Tab _Right"
+msgstr "انقل اللّ�سان إلى ال_يمين"
 
 #: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "اللسان ال_سابق"
-
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "أظهر _قائمة المتراسلين"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "أ_لسنة"
-
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_تراجع عن غلق اللسان"
+msgid "_Detach Tab"
+msgstr "_�صل اللسان"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "اسم"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "غر�ة"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "اتصل تلقائيا"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "أدر الغر� الم�ضّلة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "مكالمة صوت وصورة واردة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "يتصل %s بك صوت وصورة، هل ترغب بالإجابة؟"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "يتصل %s بك، هل ترغب بالإجابة؟"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "مكالمة واردة من %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "_ار�ض"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
-msgstr "_أجب"
+msgstr "أ_جب"
+
+#: ../src/empathy-event-manager.c:560
+msgid "_Answer with video"
+msgstr "إ_جابة مع �يديو"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "مكالمة صوت وصورة واردة من %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "دعوة غر�ة"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "دعوة للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "يدعوك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "ا_ر�ض"
 
-#: ../src/empathy-event-manager.c:759
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "ان_ضم"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "دعاك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "لقد د�عيت للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "مل� وارد من %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "كلمة السر مطلوبة"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "�%s يطلب السماح بأن يعر� بتواجدك على الخط"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3460,13 +3604,13 @@ msgstr ""
 #: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
-msgstr "%u:%02u.%02u"
+msgstr "%u:%02u:%02u"
 
 #. Translators: time left, when is is less than one hour
 #: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
-msgstr "%02u.%02u"
+msgstr "%02u:%02u"
 
 #: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
@@ -3533,7 +3677,7 @@ msgstr "\"%s\" أ�رسل إلى %s"
 msgid "File transfer completed"
 msgstr "تم نقل المل�"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "بانتظار رد الشخص الآخر"
 
@@ -3547,15 +3691,15 @@ msgstr "يتحقق من سالة \"%s\""
 msgid "Hashing \"%s\""
 msgstr "ي�لبّد \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
-msgstr "Ùª"
+msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "مل�"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "الباقي"
 
@@ -3567,165 +3711,206 @@ msgstr "نقل المل�ات"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "أزل المل�ات المرسلة الكاملة والملغية والتي �شلت من القائمة"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "ا_ستورد"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 "لم ي�عثر على أي حساب لاستيراده. إمبثي يدعم استيراد الحسابات من بدجن �قط."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "استورد الحسابات"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "استورد"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "بروتوكول"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "المصدر"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "أدخل كلمة السر"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ا�صل"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "تحتاج لإعداد حساب لرؤية المتراسلين هنا."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "لا نتائج"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "عذرًا، الحسابات %s لايمكن استخدامها حتى ترقية برنامج %s."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "تحديث البرنامج..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "نظّ�"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "أعد الاتصال"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "حر�ر الحساب"
 
-#: ../src/empathy-main-window.c:700
-msgid "Close"
-msgstr "نظي�"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "اشحن %s (%s) ..."
 
-#: ../src/empathy-main-window.c:1418
-msgid "Contact"
-msgstr "متراسل"
+#: ../src/empathy-roster-window.c:1156
+msgid "Top up account credit"
+msgstr "اشحن رصيد الحساب"
 
-#: ../src/empathy-main-window.c:1765
-msgid "Contact List"
-msgstr "قائمة المتراسلين"
+#. top up button
+#: ../src/empathy-roster-window.c:1228
+msgid "Top Up..."
+msgstr "اشحن..."
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "اعرض و _حرّر الحسابات"
+#: ../src/empathy-roster-window.c:1952
+msgid "Contact"
+msgstr "متراسل"
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "المتراسلين على ال_خريطة"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "تحتاج لت�عيل أحد حساباتك لرؤية المراسلين هنا."
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Find in Contact _List"
-msgstr "ابح_ث �ي قائمة المتراسلين"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "تحتاج لت�عيل %s لرؤية المتراسلين هنا."
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Join _Favorites"
-msgstr "ان_ض�م إلى الم�ضلين"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "قائمة المتراسلين"
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Manage Favorites"
-msgstr "أدر الم�ضلة"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "إعدادات الحساب"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "N_ormal Size"
-msgstr "حجم _عادي"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_محادثة جديدة…"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "مكالمة _جديدة…"
 
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr "حجم عادي مع أي_قونات"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "اب_حث عن المتراسلين…"
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "P_references"
-msgstr "الت_�ضيلات"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_نقل المل�ات"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "المتراسلين _غير المتَّصلين"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "أظهر البروتو_كولات"
 
-#: ../src/empathy-main-window.ui.h:10
-msgid "Sort by _Name"
-msgstr "رتب حسب الا_سم"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "رصيد الحساب"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "Sort by _Status"
-msgstr "رتّب حسب ال_حالة"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "المتراسلين على ال_خريطة"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "المتراسلين الم_منوعين"
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Compact Size"
-msgstr "حجم _مضغوط"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "الت_�ضيلات"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_نقّح"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ابح_ث �ي قائمة المتراسلين"
 
-#: ../src/empathy-main-window.ui.h:20
-msgid "_File Transfers"
-msgstr "_نقل المل�ات"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "رتب حسب الا_سم"
 
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Join…"
-msgstr "ان_ضم…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "رتّب حسب ال_حالة"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_محادثة جديدة…"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "حجم عادي مع أي_قونات"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Offline Contacts"
-msgstr "المتراسلين _غير المتَّصلين"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "حجم _عادي"
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Personal Information"
-msgstr "الم_علومات الشخصية"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "حجم _مضغوط"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_غر�ة"
 
-#: ../src/empathy-main-window.ui.h:28
-msgid "_Search for Contacts…"
-msgstr "اب_حث عن المتراسلين…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "ان_ضم…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "ان_ض�م إلى الم�ضلين"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "أدر الم�ضلة"
+
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "غر�ة دردشة"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "الأعضاء"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -3738,22 +3923,27 @@ msgstr ""
 "مطلوب كلمة سر: %s\n"
 "الأعضاء: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "نعم"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "لا"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "تعذّر بدء سرد الغر�"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "تعذّر إيقا� سرد الغر�"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "تعذّر تحميل قائمة الغر�"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "انضم للغر�ة"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -3763,6 +3953,10 @@ msgstr ""
 "الائحة."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ال_غ�ر�ة:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -3770,341 +3964,943 @@ msgstr ""
 "أدخ�ل الخادوم الذي يستضي� الغر�ة، أو اتركه �ارغا إذا كانت الغر�ة على خادوم "
 "الحساب الحالي"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "انضم للغر�ة"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "تعذّر تحميل قائمة الغر�"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "قائمة الغر�"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ال_غ�ر�ة:"
-
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "تم إستلام الرسالة"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "أرسلت الرسالة"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "محادثة جديدة"
 
-#: ../src/empathy-preferences.c:142
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "اتصل المتراسل"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ان�صل المتراسل"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "الحساب متصل"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "الحساب غير متصل"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "اللغة"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "أحمد"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "محمد"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "السلام عليكم"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "كي� حالك أخي محمد"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "هل جرّبت نسخة إمبثي الجديدة؟"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "أم لا زلت تعمل على النسخة القديمة؟"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "نعم، لقد جربتها وهي رائعة"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "ق�طع الاتصال بأحمد"
+
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "الت�ضيلات"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "المظهر"
+msgid "Show _smileys as images"
+msgstr "أظهر الابت_سامات كرسوم"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "السلوك"
+msgid "Show contact _list in rooms"
+msgstr "أظهر _قائمة المتراسلين �ي الغر�"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "_سمة المحادثة:"
+msgid "Appearance"
+msgstr "المظهر"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "عطل التنبيهات عندما أكون بعيدا أو مشغولا"
+msgid "Start chats in:"
+msgstr "ابدأ الم�حادثات �ي:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "عطل الأصوات عندما أكون بعيدا أو مشغولا"
+msgid "new ta_bs"
+msgstr "أ_لسنة جديدة"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "اعرض الأحداث القادمة �ي منطقة التنبيهات"
+msgid "new _windows"
+msgstr "_نوا�ذ جديدة"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "�عّل التنبيهات عندما يصبح المتراسل على الخط"
+msgid "Display incoming events in the notification area"
+msgstr "اعرض الأحداث الواردة �ي منطقة التنبيهات"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "�عّل التنبيهات عندما يصبح المتراسل غير متصل"
+msgid "_Automatically connect on startup"
+msgstr "_اتّصل آليا عند بدء التَّشغيل"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "�عّل التنبيهات عندما تكون المحادثة غير مركز عليها"
+msgid "Log conversations"
+msgstr "سجّل المحادثات"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "�عل تدقيق التهجئة للغات:"
+msgid "Behavior"
+msgstr "السلوك"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "عامّ"
 
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_�عّل بالون التنبيهات"
+
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "مصدر المكان:"
+msgid "Disable notifications when _away or busy"
+msgstr "عطل التنبيهات عندما أكون _بعيدا أو مشغولا"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "سجّل المحادثات"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "�عّل التنبيهات عندما تكون الم_حادثة غير مركز عليها"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Notifications"
-msgstr "التنبيهات"
+msgid "Enable notifications when a contact comes online"
+msgstr "�عّل التنبيهات عندما يصبح المتراسل على الخط"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Play sound for events"
-msgstr "شغل صوت للأحداث"
+msgid "Enable notifications when a contact goes offline"
+msgstr "�عّل التنبيهات عندما يصبح المتراسل غير متصل"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "الخصوصية"
+msgid "Notifications"
+msgstr "التنبيهات"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"دقة المكان المنخ�ضة تعني أن لا شيء أدق من المدينة والمحا�ظة والدولة سي�نشر.  "
-"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة. "
+msgid "_Enable sound notifications"
+msgstr "_�عّل التنبيهات الصوتية"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "أظهر الابت_سامات كرسوم"
+msgid "Disable sounds when _away or busy"
+msgstr "عطل الأ_صوات عندما أكون بعيدا أو مشغولا"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "أظهر _قائمة المتراسلين �ي الغر�"
+msgid "Play sound for events"
+msgstr "شغل صوت للأحداث"
 
 #: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "الأصوات"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "التدقيق الإملائي"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "استخدم إلغاء ال_صدى لتحسين جودة المكالمة"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "الس�مات"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "_Automatically connect on startup"
-msgstr "_اتّصل آليا عند بدء التَّشغيل"
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"يساعد إلغاء الصدى على جعل صوتك أوضح للشخص الآخر، ولكنه قد يسبب مشاكل على بعض "
+"الحواسب. إذا كنت تسمع أنت أو الشخص الآخر ضوضاء غريبة أو جلبة خلال المكالمات، "
+"حاول إيقا� إلغاء الصدى وقم بإعادة تشغيل المكالمة."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "_Cellphone"
-msgstr "_هات� محمول"
+msgid "_Publish location to my contacts"
+msgstr "ا_نشر مكاني إلى المتراسلين"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "_Enable bubble notifications"
-msgstr "_�عّل بالون التنبيهات"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable sound notifications"
-msgstr "_�عّل التنبيهات الصوتية"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"دقة المكان المنخ�ضة تعني أن لا شيء أدق من المدينة والمحا�ظة والدولة سي�نشر. "
+"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "_GPS"
-msgstr "_نظام المواقع الجغرا�ي"
+msgid "_Reduce location accuracy"
+msgstr "_قلل دقة المكان"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ال_شبكة (رقم الإنترنت، لا سلكي)"
+msgid "Privacy"
+msgstr "الخصوصية"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Open new chats in separate windows"
-msgstr "ا_�تح غر� الدردشة الجديدة �ي نوا�ذ من�صلة"
+msgid "_GPS"
+msgstr "_نظام المواقع الجغرا�ي"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Publish location to my contacts"
-msgstr "ا_نشر مكاني إلى المتراسلين"
+msgid "_Cellphone"
+msgstr "_هات� محمول"
+
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ال_شبكة (رقم الإنترنت، لا سلكي)"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Reduce location accuracy"
-msgstr "_قلل دقة المكان"
+msgid "Location sources:"
+msgstr "مصدر المكان:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "�عل تدقيق التهجئة للغات:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "التدقيق الإملائي"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_سمة المحادثة:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "الشكل:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "الس�مات"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "الحالة"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "أ_نه"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "مشهد خريطة المتراسَلين"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "اح�ظ"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "البيانات كبيرة جدًا بالنسبة للصق واحد. رجاءً اح�ظ السجلات إلى مل�."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "نا�ذة التنقيح"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1970
+#, fuzzy
+msgid "Send to pastebin"
+msgstr "أرسل إلى سلّة اللصق"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "ألب�ث"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "المستوى"
+msgstr "المستوى "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "تنقيح"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "معلومات"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "رسالة"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "حر�ج"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "الوقت"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "النطاق"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "ال�ئة"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "المستوى"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "مدير الاتصالات المختار لا يدعم امتداد التنقيح عن بعد."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
-msgstr "ادع� المشارك"
+msgstr "دعوة شخص لهذه المحادثة"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "اختر متراسلا لدعوته إلى المحادثة:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ادع�"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "لا تعرض أي حوارات، قم بالعمل (مثلا: الاستيراد) ثم أغلق"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "لا تعرض أي حوارات إلا �ي حال وجود حسابات \"أشخاص قريبون\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "حدد الحساب المعطى (مثلا gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- حسابات إمبثي"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "حسابات إمبثي"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "أظهر خدمة محددة"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- منقّح إمبثي"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "منقّح إمبثي"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- مرسال الدردشة إمبثي"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "استجب"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "ار�ض"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "أجب"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:206
+msgid "Answer with video"
+msgstr "أجابة مع �يديو"
+
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "لا ت�جب"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "اقبل"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "مكالمة �ائتة م�ن %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:239
+msgid "Provide"
+msgstr "زوّد"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "حاول %s الاتصال بك قبل قليل لكنك كنت مشغولا بمكالمة أخرى."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
+msgid "i"
+msgstr "i"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "اتصل باستخدام %s"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "رقم الإنترنت كما يراه الجهاز"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "رقم الإنترنت كما يراه خادوم على الإنترنت"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "رقم الإنترنت للند كما ي�رى على الجانب الآخر"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "رقم الإنترنت لخادوم تقوية"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "رقم الإنترنت لمجموعة توصيل متعدد"
+
+#: ../src/empathy-call-window.c:2883
+msgid "On hold"
+msgstr "قيد الانتظار"
+
+#: ../src/empathy-call-window.c:2886
+msgid "Mute"
+msgstr "أكتم"
+
+#: ../src/empathy-call-window.c:2888
+msgid "Duration"
+msgstr "المدة"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2891
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02d"
+
+#: ../src/empathy-call-window.c:2987
+msgid "Technical Details"
+msgstr "الت�اصيل التقنية"
+
+#: ../src/empathy-call-window.c:3026
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "برمجية %s لا ت�هم أيا من أنساق الصوت المدعومة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3031
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "برمجية %s لا ت�هم أيا من أنساق ال�يديو المدعومة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3037
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"تعذّر إنشاء اتصال مع %s. قد يكون أحدكما �ي شبكة لا تسمح بالاتصالات المباشرة."
+
+#: ../src/empathy-call-window.c:3043
+msgid "There was a failure on the network"
+msgstr "حدث عطل �ي الشبكة"
+
+#: ../src/empathy-call-window.c:3047
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "أنساق الصوت المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "أنساق ال�ديو المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3062
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"حدث أمر غير متوقع �ي مكون تليباثي. من �ضلك <a href=\"%s\">أبلغ عن هذه العلة</"
+"a> وأر�ق السجل المجمع �ي نا�ذة 'نقح' من قائمة 'مساعدة'."
+
+#: ../src/empathy-call-window.c:3071
+msgid "There was a failure in the call engine"
+msgstr "حدث عطل �ي محرك الاتصالات"
+
+#: ../src/empathy-call-window.c:3074
+msgid "The end of the stream was reached"
+msgstr "و�ص�ل إلى نهاية الد�ق"
+
+#: ../src/empathy-call-window.c:3114
+msgid "Can't establish audio stream"
+msgstr "تعذر بناء د�ق الصوت"
+
+#: ../src/empathy-call-window.c:3124
+msgid "Can't establish video stream"
+msgstr "تعذر بناء د�ق ال�ديو"
+
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "رصيدك الحالي هو %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "عذرًا، لا تملك رصيدًا كا�يًا لهذه المكالمة."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "شحن"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- المرسال إمبثي"
+
+#: ../src/empathy-call.c:223
+msgid "Empathy Audio/Video Client"
+msgstr "المرسال إمبثي"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_طاب�ق حالة الأحر�"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "ما نوع حساب الدردشة الذي تمتلكه؟"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "إضا�ة حساب جديد"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "مع أصدقاء"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"يستطيع إمبثي أن يكتش� تلقائيا وي�تح محادثة مع الأشخاص المتصلين معك على ن�س "
+"الشبكة. إذا أردت استخدام هذه الخاصية �تأكد من أن الت�اصيل أدناه صحيحة."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"يمكنك تغيير هذه الت�اصيل لاحقًا أو تعطيل هذه الميزات من <span style=\"italic"
+"\">تحرير � الحسابات</span> �ي قائمة المتراسلين."
+
+#~ msgid "Contrast"
+#~ msgstr "التباين"
+
+#~ msgid "Brightness"
+#~ msgstr "السطوع"
+
+#~ msgid "Gamma"
+#~ msgstr "جاما"
+
+#~ msgid "Volume"
+#~ msgstr "الحجم"
+
+#~ msgid "_Sidebar"
+#~ msgstr "الشريط ال_جانبي"
+
+#~ msgid "Audio input"
+#~ msgstr "مدخلات الصوت"
+
+#~ msgid "Video input"
+#~ msgstr "مدخلات ال�يديو"
+
+#~ msgid "Dialpad"
+#~ msgstr "لوحة الأرقام"
+
+#~ msgid "Details"
+#~ msgstr "الت�اصيل"
+
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "مجهول"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "متَصل — %d:%02dm"
+
+#~ msgid "Redial"
+#~ msgstr "أع�د الاتصال"
+
+#~ msgid "V_ideo"
+#~ msgstr "_�ديو"
+
+#~ msgid "Video Off"
+#~ msgstr "عطّل ال�ديو"
+
+#~ msgid "Video Preview"
+#~ msgstr "معاينة ال�يديو"
+
+#~ msgid "Video On"
+#~ msgstr "�عّل ال�ديو"
+
+#~ msgid "Call the contact again"
+#~ msgstr "اتصل بالمتراسل ثانيةً"
+
+#~ msgid "Camera Off"
+#~ msgstr "عطل الكاميرا"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "عطل الكاميرا وتوق� عن إرسال ال�ديو"
+
+#~ msgid "Preview"
+#~ msgstr "معاينة"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "�عّل الكاميرا ولا ترسل �ديو"
+
+#~ msgid "Camera On"
+#~ msgstr "�عّل الكاميرا"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "�عّل الكاميرا وأرسل �ديو"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "المتراسلين المترابطين"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "حدد متراسلا لربطه"
+
+#~ msgid "New contact preview"
+#~ msgstr "معاينة متراسل جديد"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "المتراسلين المحددين �ي القائمة على اليمين سيربطون إلى بعضهم البعض."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ا_ربط المتراسلين…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "اربط المتراسلين"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ا_�صل…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "ا�صل المتراسل المرتبط المعروض إلى متراسلين من�صلين."
+
+#~ msgid "_Link"
+#~ msgstr "ار_بط"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "أأ�صل المتراسلين المرتبطين '%s'؟"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "أمتأكد من رغبتك �ي �صل هؤلاء المتراسلين المرتبطين؟ هذا سي�صل المتراسلين "
+#~ "المرتبطين إلى كل على حدة."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ا_�صل"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "حدث خطأ أثناء استيراد الحسابات."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "حدث خطأ أثناء تحليل ت�اصيل الحساب."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "حدث خطأ أثناء إنشاء الحساب."
+
+#~ msgid "There was an error."
+#~ msgstr "حدث خطأ."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "رسالة الخطأ: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "يمكنك إما العودة للخل� ومحاولة إدخال ت�اصيل الحساب مرة ثانية، أو إغلاق "
+#~ "هذا المساعد وإضا�ة الحساب لاحقا من قائمة تحرير."
+
+#~ msgid "An error occurred"
+#~ msgstr "حدث خطأ"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ألديك حساب دردشة آخر تريد إعداده؟"
+
+#~ msgid "Enter your account details"
+#~ msgstr "أدخل ت�اصيل الحساب"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "ما نوع حساب الدردشة الذي تريد إنشاءه؟"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "هل تريد إنشاء حسابات دردشة أخرى؟"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "أدخل ت�اصيل الحساب الجديد"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "مع إمبثي تستطيع الدردشة مع أصدقائك وزملائك الذين يستخدمون جوجل توك، أو "
+#~ "AIM، أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكرو�ون "
+#~ "وكاميرا تستطيع إجراء محادثات بالصوت والصورة."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "نعم، استورد معلومات حسابي من "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "نعم، سأ�دخل معلومات حسابي الآن"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "لا، أريد حسابا جديدا"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "لا، حاليا أريد رؤية الأشخاص المتصلين قريبا مني �قط"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "اختر الحسابات التي تريد استيرادها:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "لا، يك�ي هذا الآن"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "تحرير�الحسابات"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "لا أريد _ت�عيل هذه الخاصية الآن"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "لن تستطيع الدردشة مع الأشخاص المتصلين معك على ن�س الشبكة لأن telepathy-"
+#~ "salut غير مثبت. إذا أردت ت�عيل هذه الخاصية �من �ضلك ثبّت حزمة telepathy-"
+#~ "salut ثم أنشئ حساب 'أشخاص قريبون' من حوار الحسابات"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "مساعد حسابات التراسل والصوت عبر الشبكة"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "مرحبا مع إمبثي"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "استورد حساباتك الموجودة"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "من �ضلك أدخل بيانات الشخصية"
+
+#~ msgid "Protocol:"
+#~ msgstr "البروتوكول:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "أظهر مساعد الحساب"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "نوع المقبس غير مدعوم"
+
+#~| msgid "Launch My Web Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "حسابات الوب خاصتي"
+
+#~| msgid "The account %s is edited via My Web Accounts."
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "الحساب %s ح�ر�رَ من خلال %s"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "لا يمكن تحرير الحساب %s �ي إمبثي."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "شغّل \"حسابات الوب\""
+
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "تحرير %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "أ_لغ�"
+
+#~ msgid "Personal Information"
+#~ msgstr "المعلومات الشخصية"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_حرّر"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
+#~ "أم�تأكد أنك ترغب �ي إتمام العملية؟"
+
+#~ msgid "_Personal Information"
+#~ msgstr "الم_علومات الشخصية"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ا_�تح غر� الدردشة الجديدة �ي نوا�ذ من�صلة"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "رحّل إمبثي سجلات butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "�يما إذا كان إمبثي رحّل سجلات butterfly."
+
+#~ msgid "All"
+#~ msgstr "الكل"
+
+#~ msgid "_Enabled"
+#~ msgstr "_م�عّل"
+
+#~ msgid "Ungrouped"
+#~ msgstr "غير مجمّع"
+
+#~ msgid "Favorite People"
+#~ msgstr "الأشخاص الم�ضّلين"
+
+#~ msgid "Select a contact"
+#~ msgstr "حدد متراسلا"
+
+#~ msgid "Date"
+#~ msgstr "التاريخ"
+
+#~ msgid "Conversations"
+#~ msgstr "محادثات"
+
+#~ msgid "Find Next"
+#~ msgstr "ابحث عن التالي"
+
+#~ msgid "Find Previous"
+#~ msgstr "ابحث عن السابق"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "المحادثات السابقة"
+
+#~ msgid "_For:"
+#~ msgstr "_عن:"
+
+#~ msgid "Contact ID:"
+#~ msgstr "معرّ� المتراسل:"
+
+#~ msgid "C_hat"
+#~ msgstr "ا_بدأ محادثة"
+
+#~ msgid "C_all"
+#~ msgstr "ا_تصل"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "حدد تواجدك وحالتك الحالية"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "حرر الرسالة المخصّصة"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "اح�ظ رسالة _حالة جديدة"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "رسائل الحالة المح�وظة"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "الم�تراسل المحدد لا يستطيع استقبال مل�ات."
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "اعرض و _حرّر الحسابات"
+
 #~ msgid "Context"
 #~ msgstr "السياق"
diff --git a/po/as.po b/po/as.po
index e0b71801b..45686baed 100644
--- a/po/as.po
+++ b/po/as.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2009 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 #
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011.
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-15 19:40+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 18:14+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,670 +19,679 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Google Talk, Facebook, MSN আৰ� বহ�তো অন�য চেট সেৱাসমূহত চেট কৰক"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM গ�ৰাহক"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy ইন�টাৰনেট বাৰ�তাকৰণ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM গ�ৰাহক"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Google Talk, Facebook, MSN আৰ� বহ�তো অন�য চেট সেৱাসমূহত চেট কৰক"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ ব�যৱস�থাপনা কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "নত�ন চেটৰ বাবে সদায়ে পৃথক চেট উইন�ডো খোলা হ'ব।"
+msgid "Connection managers should be used"
+msgstr "সংযোগ ব�যৱস�থাপকসমূহ ব�যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "কল ভলিউম"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"স�বচালিতভাৱে বিচ�ছিন�ন/প�নৰসংযোগ কৰিবলে সংযোগ ব�যৱস�থাপকসমূহক ব�যৱহাৰ কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "কল ভলিউম, �টা শতাংশ হিচাপে।"
+msgid "Empathy should auto-connect on startup"
+msgstr "আৰম�ভ সময়ত Empathy দ�বাৰা স�বচালিতভাৱে সংযোগ স�থাপন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "কেমেৰা ডিভাইচ"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy -� আৰম�ভণিত আপোনাৰ �কাওন�টসমূহত স�বচালিতভাৱে লগিন কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "কেমেৰা অৱস�থান"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy অলস অৱস�থাত স�বচালিতভাৱে-আতৰত হব লাগিব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"দলৰ সৈতে চেট কৰা সময়ত উপনাম সম�পূৰ�ণ (টেব) ব�যৱহাৰ কৰোতে উপনামৰ পিছত যোগ কৰিব "
-"লগিয়া আখৰ।"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ব�যৱহাৰকাৰী অলস থাকিলে Empathy -� স�বচালিতভাৱে আতৰ অৱস�থাত যাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "চেট উইন�ডোৰ থীম"
+msgid "Empathy default download folder"
+msgstr "Empathy ৰ অবিকল�পিত ডাউনল'ড ফোল�ডাৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "চেট উইন�ডো থীম অপৰ"
+msgid "The default folder to save file transfers in."
+msgstr "স�থানান�তৰ কৰা সামগ�ৰী সংৰক�ষণৰ বাবে চিহ�নিত ফোল�ডাৰ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"ব�যৱহাৰ কৰিবলে বানান নিৰীক�ষক ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "স�থিৰ পৰিষ�কাৰ কাৰ�য�যসমূহ চলোৱা হবনে নীৰিক�ষণ কৰিবলে ব�যৱহৃত জাদ� সংখ�যা"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "পৰিচিত ব�যক�তিৰ তালিকা সংকোচিত কৰক"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c �ই নম�বৰক পৰিষ�কাৰ কৰা কাৰ�য�যসমূহ �ক�সিকিউট কৰা হবনে "
+"নীৰিক�ষণ কৰিবলে ব�যৱহাৰ কৰে। ব�যৱহাৰকাৰীসমূহে �ই চাবিক হস�তচালিতভাৱে সলনি কৰিব "
+"নালাগে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "সংযোগ ব�যৱস�থাপকসমূহ ব�যৱহাৰ কৰক"
+msgid "Show offline contacts"
+msgstr "অফ-লাইন অৱস�থাত থকা পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "পৰিচয় তালিকা সজোৱা নিয়ম"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "পৰিচয় তালিকাত অফলাইন থকা পৰিচয়সমূহ দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"ভিডিঅ' কলসমূহত ব�যৱহাৰ কৰিব লগিয়া অবিকল�পিত কেমেৰা ডিভাইচ, যেনে /dev/video0।"
+msgid "Show avatars"
+msgstr "অৱতাৰৰ ছবি প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ব�যৱহাৰকাৰীৰ অৱতাৰ আখৰকৰ�তা ছবি নিৰ�ধাৰণৰ বাবে ব�যৱহৃত অবিকল�পিত পঞ�জিকা"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "পৰিচয় তালিকা আৰ� চেট উইন�ডোসমূহত পৰিচয়সমূহৰ বাবে অৱতাৰসমূহ দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "আতৰত থাকিলে প'প-আপ সূচনাবাৰ�তা নিষ�ক�ৰিয় কৰক"
+msgid "Show protocols"
+msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "আতৰত থাকিলে শব�দ নিষ�ক�ৰিয় কৰক"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "পৰিচয় তালিকাৰ পৰিচয়সমূহৰ বাবে প�ৰটোকলসমূহ দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক"
+msgid "Show Balance in contact list"
+msgstr "অৱশিষ�ট পৰিচয় তালিকাত দেখ�ৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক। যদি ভ�ল, সিহতক ব�যৱহাৰকাৰীলে তৎক�ষনাত "
-"প�ৰেৰণ কৰক।"
+msgid "Whether to show account balances in the contact list."
+msgstr "�কাওন�ট অৱশিষ�টসমূহ পৰিচয় তালিকাত দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "প�ৰতিধ�বনি বাতিল সমৰ�থন"
+msgid "Compact contact list"
+msgstr "পৰিচিত ব�যক�তিৰ তালিকা সংকোচিত কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy দ�বাৰা ব�যৱহাৰকাৰীৰ ভৌগলিক অৱস�থান প�ৰকাশ কৰা সম�ভৱ হ'ব"
+msgid "Whether to show the contact list in compact mode."
+msgstr "পৰিচয় তালিকাক সংকোচিত অৱস�থাত দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "GPS সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
+msgid "Hide main window"
+msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "চেল�লাৰ নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
+msgid "Hide the main window."
+msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
+msgid "Default directory to select an avatar image from"
+msgstr "ব�যৱহাৰকাৰীৰ অৱতাৰ আখৰকৰ�তা ছবি নিৰ�ধাৰণৰ বাবে ব�যৱহৃত অবিকল�পিত পঞ�জিকা"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy ৰ অবিকল�পিত ডাউনল'ড ফোল�ডাৰ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "সৰ�বশেষ অৱতাৰৰ বাবে ব�যৱহৃত ছবি যি পঞ�জিকাৰ পৰা নিৰ�বাচন কৰা হৈছে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy -� বাটাৰফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে"
+msgid "Open new chats in separate windows"
+msgstr "নত�ন চেট আৰম�ভ হ'লে পৃথক উইন�ডোত প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy অলস অৱস�থাত স�বচালিতভাৱে-আতৰত হব লাগিব"
+msgid "Always open a separate chat window for new chats."
+msgstr "নত�ন চেটৰ বাবে সদায়ে পৃথক চেট উইন�ডো খোলা হ'ব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "আৰম�ভ সময়ত Empathy দ�বাৰা স�বচালিতভাৱে সংযোগ স�থাপন কৰক"
+msgid "Display incoming events in the status area"
+msgstr "অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy দ�বাৰা ভৌগলিক অৱস�থানৰ নিৰ�ভ�লতাৰ পৰিমাণ হ�ৰাস"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক। যদি ভ�ল, সিহতক ব�যৱহাৰকাৰীলে তৎক�ষনাত "
+"প�ৰেৰণ কৰক।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "চেটৰ উইন�ডোৰ আইকন ৰূপে Empathy দ�বাৰা পৰিচয়ৰ অৱতাৰ প�ৰয়োগ কৰক"
+msgid "The position for the chat window side pane"
+msgstr "চেট উইন�ডো কাষ পেইনৰ অৱস�থান"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit উন�নয়নক স�জ�লিৰ ব�যৱহাৰ সামৰ�থবান কৰক"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "চেট উইন�ডো কাষ পেইনৰ সংৰক�ষিত অৱস�থান (পিক�সেলসমূহত)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "নত�ন বাৰ�তাৰ বাবে প'প-আপ সূচনাবাৰ�তা সামৰ�থবান কৰক"
+msgid "Show contact groups"
+msgstr "পৰিচয় দলসমূহ দেখ�ৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "বানান পৰীক�ষণ সামৰ�থবান কৰক"
+msgid "Whether to show groups in the contact list."
+msgstr "পৰিচয় তালিকাত দলসমূহ দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব"
+msgid "Contact list sort criterion"
+msgstr "পৰিচয় তালিকা সজোৱা নিয়ম"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব।"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"পৰিচয় তালিকা সজাওতে কোনটো নিয়ম ব�যৱহাৰ কৰা হব। অবিকল�পিত হল পৰিচয়ৰ অৱস�থাৰে "
+"সজোৱা \"state\" মানৰ সৈতে। \"name\" ৰ মানে পৰিচয় তালিকাক নামৰে সজাব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "নাম সম�পূৰ�ণকৰণৰ আখৰ"
+msgid "Use notification sounds"
+msgstr "সূচনামূলক শব�দ ব�যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "নত�ন চেট আৰম�ভ হ'লে পৃথক উইন�ডোত প�ৰদৰ�শন কৰক"
+msgid "Whether to play a sound to notify of events."
+msgstr "ঘটনাসমূহ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "ব�যৱহাৰ কৰিবলে Adium থীমৰ পথ"
+msgid "Disable sounds when away"
+msgstr "আতৰত থাকিলে শব�দ নিষ�ক�ৰিয় কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"যদি চেটৰ বাবে ব�যৱহাৰ কৰা থীম Adium হয় তেন�তে ব�যৱহাৰ কৰিব লগিয়া Adium থীমৰ পথ।"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "আতৰত বা ব�যস�ত থাকোতে শব�দ অধিসূচনাসমূহ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "নত�ন বাৰ�তা প�ৰাপ�ত হ'লে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "নত�ন চেটৰ বাবে শব�দ বজাওক"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "আগ'ত বাৰ�তাসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "নত�ন বাৰ�তা পঠিওৱা হ'লে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "পৰিচিত ব�যক�তি লগিন কৰিলে শব�দ বজাওক"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "বাহিৰগামি বাৰ�তাসমূহৰ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "পৰিচিত ব�যক�তি প�ৰস�থান কৰিলে শব�দ বজাওক"
+msgid "Play a sound for new conversations"
+msgstr "নত�ন চেটৰ বাবে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "নিজেই লগিন কৰিলে শব�দ বজাওক"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "নত�ন কথোপকথনসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "নিজেই প�ৰস�থান কৰিলে শব�দ বজাওক"
+msgid "Play a sound when a contact logs in"
+msgstr "পৰিচিত ব�যক�তি লগিন কৰিলে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "অধিসূচনাসমূহ পপ আপ কৰিব যদি চেট মনোনিবেষিত নহয়"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "নেটৱাৰ�কত লগিন কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "যেতিয়া �জন পৰিচয় লগিন কৰে অধিসূচনাসমূহ পপ-আপ কৰিব "
+msgid "Play a sound when a contact logs out"
+msgstr "পৰিচিত ব�যক�তি প�ৰস�থান কৰিলে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "যেতিয়া �জন পৰিচয় লগআউট কৰে অধিসূচনাসমূহ পপ আপ কৰিব"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "নেটৱাৰ�কৰ পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "�টা কলৰ সময়ত কেমেৰা পূৰ�বদৰ�শন যি অৱস�থাত থাকিব লাগিব।"
+msgid "Play a sound when we log in"
+msgstr "নিজেই লগিন কৰিলে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "অৱশিষ�ট পৰিচয় তালিকাত দেখ�ৱাওক"
+msgid "Whether to play a sound when logging into a network."
+msgstr "�টা নেটৱাৰ�কত লগিন কৰোতে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "অৱতাৰৰ ছবি প�ৰদৰ�শন কৰক"
+msgid "Play a sound when we log out"
+msgstr "নিজেই প�ৰস�থান কৰিলে শব�দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "ৰ�মত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "�টা নেটৱাৰ�কৰ পৰা লগ আউট কৰোতে �টা শব�দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "প�ৰধান উইন�ডো বন�ধ কৰাৰ বাবে ইঙ�গিত প�ৰদৰ�শন কৰক"
+msgid "Enable popup notifications for new messages"
+msgstr "নত�ন বাৰ�তাৰ বাবে প'প-আপ সূচনাবাৰ�তা সামৰ�থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "অফ-লাইন অৱস�থাত থকা পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে �টা পপআপ অধিসূচনা দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
+msgid "Disable popup notifications when away"
+msgstr "আতৰত থাকিলে প'প-আপ সূচনাবাৰ�তা নিষ�ক�ৰিয় কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "ভাষাৰ বাবে বানান পৰীক�ষণ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "আতৰত বা ব�যস�ত থাকোতে পপ আপ অধিসূচনাসমূহ দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "স�থানান�তৰ কৰা সামগ�ৰী সংৰক�ষণৰ বাবে চিহ�নিত ফোল�ডাৰ।"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "অধিসূচনাসমূহ পপ আপ কৰিব যদি চেট মনোনিবেষিত নহয়"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "সৰ�বশেষ অৱতাৰৰ বাবে ব�যৱহৃত ছবি যি পঞ�জিকাৰ পৰা নিৰ�বাচন কৰা হৈছে।"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে চেট ইতিমধ�যে খোলা থাকিলেও, কিন�ত� মনোনিবেষিত নহয় �টা "
+"পপআপ অধিসূচনা দেখ�ৱা হব নে। "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "চেট উইন�ডো কাষ পেইনৰ অৱস�থান"
+msgid "Pop up notifications when a contact logs in"
+msgstr "যেতিয়া �জন পৰিচয় লগিন কৰে অধিসূচনাসমূহ পপ-আপ কৰিব "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "চেট উইন�ডো কাষ পেইনৰ সংৰক�ষিত অৱস�থান (পিক�সেলসমূহত)।"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "�জন পৰিচয় অনলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "চেটৰ উইন�ডোত কথোপকথন প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম।"
+msgid "Pop up notifications when a contact logs out"
+msgstr "যেতিয়া �জন পৰিচয় লগআউট কৰে অধিসূচনাসমূহ পপ আপ কৰিব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "চেট উইন�ডোত কথোপকথনৰ প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম অপৰ"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "�জন পৰিচয় অফলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "গ�ৰাফিকেল স�মাইলি ব�যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "সূচনামূলক শব�দ ব�যৱহাৰ কৰক"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "স�মাইলিসমূহক কথোপকথনৰ সময়ত গ�ৰাফীয় ছবিসমূহলে পৰিৱৰ�তন কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "চেট ৰ�মৰ বাবে থীম প�ৰয়োগ কৰক"
+msgid "Show contact list in rooms"
+msgstr "ৰ�মত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy -� ব�যৱহাৰকাৰীৰ অৱস�থান সিহতৰ পৰিচয়সমূহলে প�ৰকাশ কৰিব পাৰিব নে।"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "চেট ৰ�মসমূহত পৰিচয় তালিকা দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে GPS ব�যৱহাৰ কৰিব পাৰিব নে।"
+msgid "Chat window theme"
+msgstr "চেট উইন�ডোৰ থীম"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে চেল�লাৰ নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "চেটৰ উইন�ডোত কথোপকথন প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
+msgid "Chat window theme variant"
+msgstr "চেট উইন�ডো থীম অপৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy -� বাটাফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে নে।"
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "চেট উইন�ডোত কথোপকথনৰ প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম অপৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy -� আৰম�ভণিত আপোনাৰ �কাওন�টসমূহত স�বচালিতভাৱে লগিন কৰিব লাগে নে।"
+msgid "Path of the Adium theme to use"
+msgstr "ব�যৱহাৰ কৰিবলে Adium থীমৰ পথ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "ব�যৱহাৰকাৰী অলস থাকিলে Empathy -� স�বচালিতভাৱে আতৰ অৱস�থাত যাব লাগে নে।"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"যদি চেটৰ বাবে ব�যৱহাৰ কৰা থীম Adium হয় তেন�তে ব�যৱহাৰ কৰিব লগিয়া Adium থীমৰ পথ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy -� গোপনীয়তা কাৰণসমূহৰ বাবে অৱস�থানৰ সঠিকতা কমাব লাগে নে।"
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit উন�নয়নক স�জ�লিৰ ব�যৱহাৰ সামৰ�থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Empathy -� পৰিচয়ৰ অৱতাৰক চেট উইন�ডোৰ আইকন হিচাপে ব�যৱহাৰ কৰিব লাগে নে।"
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit উন�নয়নক স�জ�লি যেনে Web Inspector সামৰ�থবান কৰক নে নাই।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit উন�নয়নক স�জ�লি যেনে Web Inspector সামৰ�থবান কৰক নে নাই।"
+msgid "Inform other users when you are typing to them"
+msgstr "অন�য ব�যৱহাৰকাৰীসমূহক জনাব যেতিয়া আপ�নি সিহতলে লিখি আছে"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"স�বচালিতভাৱে বিচ�ছিন�ন/প�নৰসংযোগ কৰিবলে সংযোগ ব�যৱস�থাপকসমূহক ব�যৱহাৰ কৰিব লাগে নে।"
+"'composing' অথবা 'paused' চেট অৱস�থাসমূহ পঠোৱা হব নে। 'gone' অৱস�থাৰ উপৰত প�ৰভাৱ "
+"নেপেলায়।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"আপ�নি নিৰীক�ষণ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শব�দসমূহ নিৰীক�ষণ কৰা হব নে।"
+msgid "Use theme for chat rooms"
+msgstr "চেট ৰ�মৰ বাবে থীম প�ৰয়োগ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "স�মাইলিসমূহক কথোপকথনৰ সময়ত গ�ৰাফীয় ছবিসমূহলে পৰিৱৰ�তন কৰা হব নে।"
+msgid "Whether to use the theme for chat rooms."
+msgstr "চেট ৰ�মসমূহৰ বাবে থীম ব�যৱহাৰ কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Pulseaudio -ৰ প�ৰতিধ�বনি বাতিল কৰা পৰিস�ৰাৱন সামৰ�থবান কৰিব লাগে নে।"
+msgid "Spell checking languages"
+msgstr "ভাষাৰ বাবে বানান পৰীক�ষণ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "নেটৱাৰ�কত লগিন কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"ব�যৱহাৰ কৰিবলে বানান নিৰীক�ষক ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "নেটৱাৰ�কৰ পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
+msgid "Enable spell checker"
+msgstr "বানান পৰীক�ষণ সামৰ�থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "ঘটনাসমূহ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "আপ�নি নীৰিক�ষণ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শব�দসমূহ নীৰিক�ষণ কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "আগ'ত বাৰ�তাসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
+msgid "Nick completed character"
+msgstr "নাম সম�পূৰ�ণকৰণৰ আখৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "নত�ন কথোপকথনসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"দলৰ সৈতে চেট কৰা সময়ত উপনাম সম�পূৰ�ণ (টেব) ব�যৱহাৰ কৰোতে উপনামৰ পিছত যোগ কৰিব "
+"লগিয়া আখৰ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "বাহিৰগামি বাৰ�তাসমূহৰ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "চেটৰ উইন�ডোৰ আইকন ৰূপে Empathy দ�বাৰা পৰিচয়ৰ অৱতাৰ প�ৰয়োগ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "�টা নেটৱাৰ�কত লগিন কৰোতে �টা শব�দ বজোৱা হব নে।"
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy -� পৰিচয়ৰ অৱতাৰক চেট উইন�ডোৰ আইকন হিচাপে ব�যৱহাৰ কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "�টা নেটৱাৰ�কৰ পৰা লগ আউট কৰোতে �টা শব�দ বজোৱা হব নে।"
+msgid "Last account selected in Join Room dialog"
+msgstr "সৰ�বশেষ �কাওন�টত ৰ�ম অংশগ�ৰহণ ডাইলগ নিৰ�বাচিত"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "আতৰত বা ব�যস�ত থাকোতে শব�দ অধিসূচনাসমূহ বজোৱা হব নে।"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "�টা ৰ�মত অংশগ�ৰহণ কৰিবলে নিৰ�বাচিত সৰ�বশেষ �কাওন�টৰ D-Bus অবজেক�ট পথ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "�জন পৰিচয় অফলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
+msgid "Camera device"
+msgstr "কেমেৰা ডিভাইচ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "�জন পৰিচয় অনলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ভিডিঅ' কলসমূহত ব�যৱহাৰ কৰিব লগিয়া অবিকল�পিত কেমেৰা ডিভাইচ, যেনে /dev/video0।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে চেট ইতিমধ�যে খোলা থাকিলেও, কিন�ত� মনোনিবেষিত নহয় �টা "
-"পপআপ অধিসূচনা দেখ�ৱা হব নে। "
+msgid "Camera position"
+msgstr "কেমেৰা অৱস�থান"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে �টা পপআপ অধিসূচনা দেখ�ৱা হব নে।"
+msgid "Position the camera preview should be during a call."
+msgstr "�টা কলৰ সময়ত কেমেৰা পূৰ�বদৰ�শন যি অৱস�থাত থাকিব লাগিব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "�কাওন�ট অৱশিষ�টসমূহ পৰিচয় তালিকাত দেখ�ৱা হব নে।"
+msgid "Echo cancellation support"
+msgstr "প�ৰতিধ�বনি বাতিল সমৰ�থন"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "পৰিচয় তালিকা আৰ� চেট উইন�ডোসমূহত পৰিচয়সমূহৰ বাবে অৱতাৰসমূহ দেখ�ৱা হব নে।"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio ৰ প�ৰতিধ�বনি বাতিল কৰা পৰিস�ৰাৱন সামৰ�থবান কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "পৰিচয় তালিকাত অফলাইন থকা পৰিচয়সমূহ দেখ�ৱা হব নে।"
+msgid "Show hint about closing the main window"
+msgstr "প�ৰধান উইন�ডো বন�ধ কৰাৰ বাবে ইঙ�গিত প�ৰদৰ�শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "আতৰত বা ব�যস�ত থাকোতে পপ আপ অধিসূচনাসমূহ দেখ�ৱা হব নে।"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"মূখ�য উইন�ডোক শীৰ�ষক বাৰৰ 'x' ব�টামৰ সৈতে বন�ধ কৰাৰ বাৰ�তা ডাইলগক দেখ�ৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "পৰিচয় তালিকাৰ পৰিচয়সমূহৰ বাবে প�ৰটোকলসমূহ দেখ�ৱা হব নে।"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy দ�বাৰা ব�যৱহাৰকাৰীৰ ভৌগলিক অৱস�থান প�ৰকাশ কৰা সম�ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "চেট ৰ�মসমূহত পৰিচয় তালিকা দেখ�ৱা হব নে।"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy -� ব�যৱহাৰকাৰীৰ অৱস�থান সিহতৰ পৰিচয়সমূহলে প�ৰকাশ কৰিব পাৰিব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "পৰিচয় তালিকাক সংকোচিত অৱস�থাত দেখ�ৱা হব নে।"
+msgid "Empathy can use the network to guess the location"
+msgstr "নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"মূখ�য উইন�ডোক শীৰ�ষক বাৰৰ 'x' ব�টামৰ সৈতে বন�ধ কৰাৰ বাৰ�তা ডাইলগক দেখ�ৱা হব নে।"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "চেট ৰ�মসমূহৰ বাবে থীম ব�যৱহাৰ কৰা হব নে।"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "চেল�লাৰ নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"পৰিচয় তালিকা সজাওতে কোনটো নিয়ম ব�যৱহাৰ কৰা হব। অবিকল�পিত হল পৰিচয়ৰ নামৰে সজোৱা "
-"\"নাম\" মানৰ সৈতে। \"state\" -ৰ মানে পৰিচয় তালিকাক অৱস�থাৰে সজাব।"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে চেল�লাৰ নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ ব�যৱস�থাপনা কৰক"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "GPS সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে GPS ব�যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy দ�বাৰা ভৌগলিক অৱস�থানৰ নিৰ�ভ�লতাৰ পৰিমাণ হ�ৰাস"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy -� গোপনীয়তা কাৰণসমূহৰ বাবে অৱস�থানৰ সঠিকতা কমাব লাগে নে।"
+
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "কোনো কাৰণ উল�লিখিত নহয়"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "অৱস�থাৰ পৰিবৰ�তন অন�ৰোধ কৰা হৈছে"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম আপ�নি বাতিল কৰিছে"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম অন�য ব�যৱহাৰকাৰী বাতিল কৰিছে"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সমস�যা"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "অন�য ব�যৱহাৰকাৰী নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সক�ষম নহয়"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "অজ�ঞাত কাৰণ"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "নথিপত�ৰ স�থানান�তৰ সম�পূৰ�ণ হল, কিন�ত� নথিপত�ৰ ক�ষতিগ�ৰস�থ আছিল"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "দূৰবৰ�তী পৰিচয় দ�বাৰা নথিপত�ৰ স�থানান�তৰ সমৰ�থিত নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "নিৰ�বাচিত নথিপত�ৰ �টা স�বাভাবিক নথিপত�ৰ নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "নিৰ�বাচিত নথিপত�ৰ ৰিক�ত"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
-msgstr "%s -ৰ পৰা মিচ কল"
+msgstr "%s ৰ পৰা মিচ কল"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
 #: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
-msgstr "%s -ক কল কৰা হৈছিল"
+msgstr "%s ক কল কৰা হৈছিল"
 
 #: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
-msgstr "%s -ৰ পৰা কল"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "ছ'কেটৰ ধৰন সমৰ�থিত নহয়"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "কোনো কাৰণ উল�লিখিত নহয়"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "অৱস�থাৰ পৰিবৰ�তন অন�ৰোধ কৰা হৈছে"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম আপ�নি বাতিল কৰিছে"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম অন�য ব�যৱহাৰকাৰী বাতিল কৰিছে"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সমস�যা"
+msgstr "%s ৰ পৰা কল"
 
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "অন�য ব�যৱহাৰকাৰী নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সক�ষম নহয়"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "অজ�ঞাত কাৰণ"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "উপস�থিত"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ব�যস�ত"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "আতৰত"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "অদৃশ�য"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "অফ-লাইন"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "অজ�ঞাত"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "কোনো কাৰণ ধাৰ�য�য কৰা হোৱা নাই"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "অৱস�থা অফলাইনলে সংহতি কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "নেটৱাৰ�ক  ত�ৰ�টি"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "প�ৰমাণীকৰণ ব�যৰ�থ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "�নক�ৰিপছন  ত�ৰ�টি"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "নাম বৰ�তমানে ব�যৱহৃত হৈছে"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "প�ৰমাণপত�ৰ উপলব�ধ কৰা নহয়"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "প�ৰমাণপত�ৰ বিশ�বস�ত নহয়"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "প�ৰমাণপত�ৰৰ সময়সীমা উত�তীৰ�ণ হৈছে"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "প�ৰমাণপত�ৰ সক�ৰিয় কৰা নহয়"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "প�ৰমাণপত�ৰৰ হস�টনাম লৈ অমিল"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "প�ৰমাণপত�ৰৰ ফিনঙ�গাৰপ�ৰিন�ট লৈ অমিল"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "স�বয়ং স�বাক�ষৰিত প�ৰমাণপত�ৰ"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "প�ৰমাণপত�ৰ  ত�ৰ�টি"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "ইনক�ৰিপষণ উপলব�ধ নহয়"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "প�ৰমাণপত�ৰ অবৈধ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "সংযোগ নাকচ কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "সংযোগ স�থাপন কৰিব নোৱাৰি"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "সংযোগ হেৰাইছে"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "সম�পদ ইতিমধ�যে চাৰ�ভাৰৰ সৈতে সংযোগিত"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "�ই �কাওন�ট ইতিমধ�যে চাৰ�ভাৰৰ সৈতে সংযোগিত"
 
-#: ../libempathy/empathy-utils.c:356
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:357
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "সংযোগক �কে সম�পদ ব�যৱহাৰ কৰি �টা নত�ন সংযোগৰে প�ৰতিস�থাপন কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "�কাওন�ট ইতিমধ�যে চাৰ�ভাৰত উপস�থিত"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "চাৰ�ভাৰ সংযোগ ব�যৱস�থাপনা কৰিবলে বৰ�তমানে অতি ব�যস�ত"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "প�ৰমাণপত�ৰ প�ৰত�যাহাৰ কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:365
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "প�ৰমাণপত�ৰয় �টা অস�ৰক�ষিত চিফাৰ �লগৰিথম ব�যৱহাৰ কৰে অথবা ক�ৰিপ�টোগ�ৰাফিয়ভাৱে দ�ৰ�বল"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -690,283 +699,277 @@ msgstr ""
 "চাৰ�ভাৰ প�ৰমাণপত�ৰৰ দৈৰ�ঘ, অথবা চাৰ�ভাৰ প�ৰমাণপত�ৰ শৃংখলৰ গভীৰতা, ক�ৰিপ�টোগ�ৰাফী "
 "লাইব�ৰেৰীয়ে প�ৰণয়ন কৰা সীমাসমূহত অতিক�ৰম কৰে"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "আপোনাৰ চফ�টৱেৰ অতি প�ৰনি"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "অভ�যন�তৰীক ত�ৰ�টি"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "ওচৰৰ ব�যক�তিৰ"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ছেকেণ�ড আগতে"
 msgstr[1] "%d ছেকেণ�ড আগতে"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট আগতে"
 msgstr[1] "%d মিনিট আগতে"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন�টা আগতে"
 msgstr[1] "%d ঘন�টা আগতে"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন আগতে"
 msgstr[1] "%d দিন আগতে"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d সপ�তাহ আগতে"
 msgstr[1] "%d সপ�তাহ আগতে"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাহ আগতে"
 msgstr[1] "%d মাহ আগতে"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "ভবিষ�যতে"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "পাছৱাৰ�ড পোৱা নগল"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s (%s) ৰ বাবে IM �কাওন�ট পাছৱাৰ�ড"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "�কাওন�ট %s (%s) ত চেটৰ�ম '%s' ৰ বাবে পাছৱাৰ�ড"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "সকলো �কাওন�ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "�কাওন�ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "পাছৱাৰ�ড"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "চাৰ�ভাৰ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "পোৰ�ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "মোৰ ৱেব �কাওন�টসমূহ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "�কাওন�ট %s -ক %s -ৰে সম�পাদন কৰা হৈছে।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "�কাওন�ট %s -ক Empathy -ত সম�পাদন কৰিব নোৱাৰি।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "মোৰ ৱেব �কাওন�টসমূহ লঞ�চ কৰক"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s সম�পাদনা কৰক"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ব�যৱহাৰকাৰীৰ নাম:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "প�ৰয়োগ কৰক (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "লগিন কৰক (_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "�ই �কাওন�ট ইতিমধ�যে চাৰ�ভাৰত অস�তিত�ববান"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "চাৰ�ভাৰত �টা নত�ন �কাওন�ট সৃষ�টি কৰক"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "বাতিল কৰক (_n)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s ত"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s �কাওন�ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "নত�ন �কাওন�ট"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>উদাহৰণ:</b> মোৰপৰ�দানাম"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "পাছৱাৰ�ড: (_w)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "উন�নত বিকল�প"
+msgid "Screen _Name:"
+msgstr "পৰ�দাত ব�যৱহৃত নাম: (_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>উদাহৰণ:</b> মোৰপৰ�দানাম"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "পাছৱাৰ�ড: (_w)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "পাছৱাৰ�ড মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "পাছৱাৰ�ড মনত ৰাখক"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "পোৰ�ট: (_P)"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "পাছৱাৰ�ড মনত ৰাখক"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "পৰ�দাত ব�যৱহৃত নাম: (_N)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "চাৰ�ভাৰ: (_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "আপোনাৰ AIM পাছৱাৰ�ড কি ?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "উন�নত বিকল�প"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "আপোনাৰ AIM �কাওন�টৰ ব�যৱহাৰকাৰীৰ-নাম কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "পোৰ�ট: (_P)"
+msgid "What is your AIM password?"
+msgstr "আপোনাৰ AIM পাছৱাৰ�ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "চাৰ�ভাৰ: (_S)"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>উদাহৰণ:</b> ব�যৱহাৰকাৰীনাম"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "পাছৱাৰ�ড মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "লগিন ID: (_D)"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>উদাহৰণ:</b> ব�যৱহাৰকাৰীনাম"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "আপোনাৰ GroupWise ব�যৱহাৰকাৰীৰ ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "আপোনাৰ GroupWise পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>উদাহৰণ:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "আখৰ সংহতি (_a):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "আপোনাৰ ICQ UIN কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ পাছৱাৰ�ড কি ?"
 
@@ -1003,11 +1006,23 @@ msgstr "বিকল�পসমূহ"
 msgid "None"
 msgstr "কোনো নহয়"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "নেটৱাৰ�ক"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "নেটৱাৰ�ক:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "আখৰ সংহতি:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "চাৰ�ভাৰসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1015,14 +1030,6 @@ msgstr ""
 "সৰহভাগ IRC চাৰ�ভাৰসমূহৰ �টা পাছৱাৰ�ডৰ প�ৰয়োজন নহয়, সেয়েহে যদি আপ�নি নিশ�চিত নহয়, "
 "�টা পাছৱাৰ�ড নসোমাব।"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "নেটৱাৰ�ক"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "নেটৱাৰ�ক:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "উপনাম:"
@@ -1039,48 +1046,20 @@ msgstr "পà§�ৰসà§�থানসময়ত পà§�ৰদৰà§�শিত বাà
 msgid "Real name:"
 msgstr "প�ৰকৃত নাম:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "চাৰ�ভাৰসমূহ"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "আপোনাৰ IRC উপনাম কি?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "কোন IRC নেটৱাৰ�ক?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>উদাহৰণ:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>উদাহৰণ:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ইনক�ৰিপষণৰ প�ৰয়োজন (TLS/SSL) (_y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL প�ৰমাণপত�ৰ ত�ৰ�টিসমূহ উপেক�ষা কৰক (_g)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "চাৰ�ভাৰৰ বৈশিষ�ট�য উপেক�ষা কৰক"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "গ�ৰ�ত�ব (_t):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "আপোনাৰ IRC উপনাম কি?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "সম�পদ: (_u)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "আপোনাৰ Facebook ব�যৱহাৰকাৰীনাম কি?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1092,179 +1071,203 @@ msgstr ""
 "যদি আপোনাৰ �টা Facebook ব�যৱহাৰকাৰীনাম নাই �টা বাছইবলে <a href=\"http://www."
 "facebook .com/username/\">�ই পৃষ�ঠা ব�যৱহাৰ কৰক</a>।"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "প�ৰনি SSL ব�যৱহাৰ কৰা হ'ব (_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "আপোনাৰ Facebook পাছৱাৰ�ড কি?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "আপোনাৰ Facebook ব�যৱহাৰকাৰীনাম কি?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "আপোনাৰ Google ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>উদাহৰণ:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "আপোনাৰ Google পাছৱাৰ�ড কি ?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>উদাহৰণ:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL প�ৰমাণপত�ৰ ত�ৰ�টিসমূহ উপেক�ষা কৰক (_g)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "গ�ৰ�ত�ব (_t):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "সম�পদ: (_u)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ইনক�ৰিপষণৰ প�ৰয়োজন (TLS/SSL) (_y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "প�ৰনি SSL ব�যৱহাৰ কৰা হ'ব (_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "চাৰ�ভাৰৰ বৈশিষ�ট�য উপেক�ষা কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "আপোনাৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "আপোনাৰ Jabber পাছৱাৰ�ড কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "আপোনাৰ পছন�দৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "আপোনাৰ Jabber পাছৱাৰ�ড কি ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "আপোনাৰ পছন�দৰ Jabber পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>উদাহৰণ:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "আপোনাৰ Windows Live ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "আপোনাৰ Windows Live পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ই-মেইল ঠিকনা (_m):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "উপনাম (_k):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "পদবি: (_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "নাম: (_F)"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "প�ৰকাশিত নাম: (_P)"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "পদবি: (_L)"
+msgid "E-_mail address:"
+msgstr "ই-মেইল ঠিকনা (_m):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "প�ৰকাশিত নাম: (_P)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ব�যৱহাৰকাৰীৰ নাম: (_U)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>উদাহৰণ:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "প�ৰমাণীকৰণ ব�যৱহাৰকাৰীনাম:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "বান�ধনী খোজ কৰক"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN চাৰ�ভাৰ স�বচালিতভাৱে খোজ কৰক"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "�ই �কাওন�টক লেন�ডলাইন আৰ� মবাইল ফোনসমূহ কল কৰিবলে ব�যৱহাৰ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS ত�ৰ�টিসমূহ উপেক�ষা কৰক"
+msgid "NAT Traversal Options"
+msgstr "NAT ভ�ৰমণ বিকল�পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "অন�তৰাল (ছেকেণ�ডসমূহ)"
+msgid "Proxy Options"
+msgstr "প�ৰক�সি বিকল�পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "জীৱন�ত-ৰাখক বিকল�পসমূহ"
+msgid "Miscellaneous Options"
+msgstr "বহ� বিকল�পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ঢিলা ৰ�টিং"
+msgid "STUN Server:"
+msgstr "STUN চাৰ�ভাৰ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "পদ�ধতি:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN চাৰ�ভাৰ স�বচালিতভাৱে খোজ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "বহ� বিকল�পসমূহ"
+msgid "Discover Binding"
+msgstr "বান�ধনী খোজ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT ভ�ৰমণ বিকল�পসমূহ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "চাৰ�ভাৰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "জীৱন�ত-ৰাখক বিকল�পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "পোৰ�ট:"
+msgid "Mechanism:"
+msgstr "পদ�ধতি:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "প�ৰক�সি বিকল�পসমূহ"
+msgid "Interval (seconds)"
+msgstr "অন�তৰাল (ছেকেণ�ডসমূহ)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "প�ৰমাণীকৰণ ব�যৱহাৰকাৰীনাম:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "পৰিৱহন:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN চাৰ�ভাৰ:"
+msgid "Loose Routing"
+msgstr "ঢিলা ৰ�টিং"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "চাৰ�ভাৰ:"
+msgid "Ignore TLS Errors"
+msgstr "TLS ত�ৰ�টিসমূহ উপেক�ষা কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "পৰিৱহন:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "�ই �কাওন�টক লেন�ডলাইন আৰ� মবাইল ফোনসমূহ কল কৰিবলে ব�যৱহাৰ কৰক"
+msgid "Port:"
+msgstr "পোৰ�ট:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "আপোনাৰ SIP �কাওন�টৰ পাছৱাৰ�ড কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "আপোনাৰ SIP লগিন ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ব�যৱহাৰকাৰীৰ নাম: (_U)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "আপোনাৰ SIP �কাওন�টৰ পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! ID (_D):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "কনফাৰেঞ�চ আৰ� চেট ৰ�ম নিমন�ত�ৰণসমূহ উপেক�ষা কৰক (_g)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ৰ�ম তালিকাৰ স�থানীয়: (_R)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "আপোনাৰ Yahoo! ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "আপোনাৰ Yahoo! পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! ID (_D):"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ৰ�ম তালিকাৰ স�থানীয়: (_R)"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1302,211 +1305,228 @@ msgstr "সকলো নথিপত�ৰ"
 msgid "Click to enlarge"
 msgstr "ডাঙৰ মাপত প�ৰদৰ�শনৰ বাবে ক�লিক কৰক"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "কল আৰম�ভ কৰোতে �টা ত�ৰ�টি হৈছিল"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "ধাৰ�য�য কৰা পৰিচয়ে কলসমূহৰ সমৰ�থন নকৰে"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "ধাৰ�য�য কৰা পৰিচয় অফলাইন"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "ধাৰ�য�য কৰা পৰিচয় বৈধ নহয়"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�ই প�ৰটোকলত আপাতকালীন কলসমূহ সমৰ�থিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "আপোনাৰ �ই কল উপস�থাপন কৰিবলে পৰ�যাপ�ত দেন নাই"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "ব�যক�তিগত চেট খোলিবলে ব�যৰ�থ"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "বিষয় �ই কথোপকথনত সমৰ�থিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "আপোনাৰ �ই বিষয় সলনি কৰাৰ অন�মতি নাই"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� �টা বৈধ পৰিচয় ID নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: বৰ�তমান কথোপকথনৰ পৰা সকলো বাৰ�তা পৰিষ�কাৰ কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: বৰ�তমান কথোপকথনৰ বিষয় সংহতি কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: �টা নত�ন চেট ৰ�মত যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: �টা নত�ন চেট ৰ�মত যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<chat room ID>] [<reason>]: চেট ৰ�ম �ৰক, অবিকল�পিতভাৱে বৰ�তমানটো"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: �টা ব�যক�তিগত চেট খোলক"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: �টা ব�যক�তিগত চেট খোলক"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: বৰ�তমান চাৰ�ভাৰত আপোনাৰ উপনাম সলনি কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: বৰ�তমান কথোপকথনলে ACTION বাৰ�তা পঠাওক"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <message>: বৰ�তমান কথোপকথনলে <message> পঠাওক। ইয়াক �টা  '/' -ৰে আৰম�ভ "
-"হোৱা বাৰ�তা পঠাবলে ব�যৱহাৰ কৰা হয়। উদাহৰণস�বৰূপ: \"/say /join -ক �টা নত�ন চেট "
-"ৰ�মলে যোগদান কৰিবলে ব�যৱহাৰ কৰা হয়\""
+"হোৱা বাৰ�তা পঠাবলে ব�যৱহাৰ কৰা হয়। উদাহৰণস�বৰূপ: \"/say /join ক �টা নত�ন চেট ৰ�মলে "
+"যোগদান কৰিবলে ব�যৱহাৰ কৰা হয়\""
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: �জন পৰিচয়ৰ বিষয়ে তথ�য প�ৰদৰ�শন কৰে"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<command>]: সকলো সমৰ�থিত কমান�ড দেখ�ৱাওক। যদি <command> -ৰ বিৱৰণ দিয়া "
+"/help [<command>]: সকলো সমৰ�থিত কমান�ড দেখ�ৱাওক। যদি <command> ৰ বিৱৰণ দিয়া "
 "আছে, ইয়াৰ ব�যৱহাৰ দেখ�ৱাওক।"
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "ব�যৱহাৰ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "অজ�ঞাত কমান�ড"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "অজ�ঞাত কমান�ড; উপলব�ধ কমান�ডসমূহৰ বাবে /help চাওক"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "বাৰ�তা পঠাবলে অপৰ�যাপ�ত মেমৰি আছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' বাৰ�তা পঠিয়াবলৈ সমস�যা: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "বাৰ�তা পঠাবলে ত�ৰ�টি: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "বাৰ�তা পঠাবলে অপৰ�যাপ�ত বেলেঞ�চ। <a href='%s'>টপ আপ</a>।"
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ক�ষমতাবান নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "অফ-লাইন"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "পৰিচিত ব�যক�তিৰ তথ�য বৈধ নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "অন�মতি প�ৰদান কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "বাৰ�তা অত�যাধিক দীঘল"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "প�ৰয়োগ কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "অজ�ঞাত"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "'%s' বাৰ�তা পঠিয়াবলৈ সমস�যা: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "বাৰ�তা পঠাবলে ত�ৰ�টি: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "বিষয়:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "নিৰ�ধাৰিত বিষয়: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "বিষয় %s দ�বাৰা সংহত: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "বিষয় নিৰ�ধাৰিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(প�ৰস�তাবিত তথ�য অন�পস�থিত)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr "'%s' -ক শব�দকোষলে যোগ কৰক"
+msgstr "'%s' ক শব�দকোষলে যোগ কৰক"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr "'%s' -ক %s শব�দকোষলে যোগ কৰক"
+msgstr "'%s' ক %s শব�দকোষলে যোগ কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "স�মাইলি আখৰ অন�তৰ�ভ�ক�ত কৰক"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "পঠিয়াই দিয়ক (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "প�ৰস�তাবিত বানান (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "শেহতীয়া লগসমূহ উদ�ধাৰ কৰোতে ব�যৰ�থ হল"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
@@ -1514,12 +1534,12 @@ msgstr "%s ৰ সৈতে সংযোগ বিচà§�ছিনà§�ন কৰà¦
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ক %2$s দ�বাৰা বিতাড়ন কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ক বিতাড়ন কৰা হৈছে"
@@ -1527,17 +1547,17 @@ msgstr "%s ক বিতাড়ন কৰা হৈছে"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ক %2$s দ�বাৰা প�ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s ক প�ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ৰ�মৰ পৰা ওলাই গৈছে"
@@ -1547,17 +1567,17 @@ msgstr "%s ৰ�মৰ পৰা ওলাই গৈছে"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ৰ�মত আহিছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �তিয়া %s হিচাপে জনাজাত"
@@ -1565,90 +1585,90 @@ msgstr "%s �তিয়া %s হিচাপে জনাজাত"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "বিচ�ছিন�ন"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "আপ�নি �ই পাছৱাৰ�ড সংৰক�ষণ কৰিব বিচাৰে নে?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "�তিয়া নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "প�নৰ চেষ�টা কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "ভ�ল পাছৱাৰ�ড। অন�গ�ৰহ কৰি প�নৰ চেষ�টা কৰক।:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "�ই ৰ�ম �টা পাছৱাৰ�ডৰে স�ৰক�ষিত:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "সংয�ক�ত"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "চেট"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "অজ�ঞাত অথবা অবৈধ চিনাক�তক"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "পৰিচয় প�ৰতিৰোধ কৰা অস�থায়ীভাৱে উপলব�ধ নহয়"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "পৰিচয় প�ৰতিৰোধ কৰা উপলব�ধ নহয়"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "অন�মতি নাকচ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "পৰিচয় প�ৰতিৰোধ কৰিব নোৱাৰি"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "প�ৰতিৰোধ কৰা পৰিচয়সমূহ সম�পাদনা কৰক"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "�কাওন�ট"
 
@@ -1658,464 +1678,369 @@ msgstr "প�ৰতিৰোধ কৰা পৰিচয়সমূহ"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "আতৰাওক"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "লিঙ�ক দ�বাৰা চিহ�নিত ঠিকনা নকল কৰক (_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "সংযোগ খোলক (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "যোগাযোগ  তথ�য পৰিবৰ�তন কৰক"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "ব�যক�তিগত তথ�য"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "নত�ন পৰিচয়"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s প�ৰতিৰোধ কৰিবনে?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
-"আপ�নি নিশ�চিত নে আপ�নি '%s' -ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা প�ৰতিৰোধ কৰিব বিচাৰে?"
+"আপ�নি নিশ�চিত নে আপ�নি '%s' ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা প�ৰতিৰোধ কৰিব বিচাৰে?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "প�ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "�ই পৰিচয় নিন�দ�ক হিচাপে সংবাদন কৰক (_R)"
 msgstr[1] "�ই পৰিচয়সমূহক নিন�দ�ক হিচাপে সংবাদন কৰক (_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "পিছত নিৰ�ধাৰণ কৰা হ'ব (_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "স�বাক�ষৰণৰ অন�ৰোধ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ব�যৱহাৰকাৰীক প�ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "দলীয় নহয়"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "পছন�দৰ মান�হ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "'%s' নামৰ দল নিশ�চিতৰূপে আ�তৰাবলৈ ইচ�ছ�ক নে ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "দল আ�তৰ�ৱা হৈছে"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "আ�তৰাওক (_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "আপ�নি নিশ�চিতৰূপে '%s' ক পৰিচিত তালিকাৰ পৰা আ�তৰাবলৈ ইচ�ছ�ক নে ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "পৰিচিত ব�যক�তিক আ�তৰ�ৱা হৈছে"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "পৰিচয় যোগ কৰক (_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "পৰিচয় প�ৰতিৰোধ কৰক (_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "চেট (_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "অডিঅ' কল (_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "ভিডিঅ' কল (_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "পূৰ�ববৰ�তী কথোপকথনসমূহ (_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "নথিপত�ৰ পঠিয়াওক"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "মোৰ ডেস�কটপ অংশীদাৰী কৰক"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "পছন�দৰ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "তথ�য (_m)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "সম�পাদনা কৰক (_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "আপোনাক �ই ৰ�মলৈ আমন�ত�ৰণ জনোৱা হৈছে"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "চেট ৰ�মলৈ আমন�ত�ৰণ কৰক (_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "পিছত নিৰ�ধাৰণ কৰা হ'ব (_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "পৰিচয়সমূহ বিচাৰক"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "সন�ধান কৰক: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "পৰিচয় যোগ কৰক (_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "কোনো পৰিচয় পোৱা নগল"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "আপোনাৰ পৰিচয় দিয়া বাৰ�তা:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "অন�গ�ৰহ কৰি যেতিয়া আপ�নি অনলাইন থাকে মোক চাব দিব। ধন�যবাদ!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "�টা পৰিচয় নিৰ�বাচন কৰক"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "সম�পূৰ�ণ নাম:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ফোন নম�বৰ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ই-মেইল ঠিকনা:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ৱেবছাইট:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "জন�মদিন:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "শেষ দেখা হৈছিল:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "পৰা সংয�ক�ত:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "আতৰত বাৰ�তা:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "চেনেলসমূহ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "দেশৰ ISO কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "দেশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ৰাজ�য:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "নগৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "অঞ�চল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "পোস�টেল কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "ৰাস�তা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "বিল�ডিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "তল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ঘৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "লিখনী:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "বিৱৰণ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "যথাৰ�থতাৰ মাত�ৰা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ত�ৰ�টি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "উলম�ব দিশৰ ত�ৰ�টি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "অন�ভূমিক দিশৰ ত�ৰ�টি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "বিয়েৰিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "আৰোহণৰ গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "সৰ�বশেষ উন�নয়নৰ তাৰিখ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "দ�ৰাঘিমাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "অক�ষাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "উচ�চতা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "অৱস�থান"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC ত"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰক"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰিবলৈ ব�যৰ�থ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>অৱস�থান</b> (date) ত\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "উপনাম:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "গ�ৰাহক  তথ�য"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "গ�ৰাহক:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "ব�যক�তিগত বিৱৰণসমূহ"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "যোগাযোগ  বিবৰণ"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "সম�পূৰ�ণ নাম"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "ফোন নম�বৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "ই-মেইল ঠিকনা"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "ৱেবছাইট"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "জন�মদিন"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "শেষ দেখা হৈছিল:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "পৰা সংয�ক�ত:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "আতৰত বাৰ�তা:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "কৰ�ম"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "ঘৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "মবাইল"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "মাত"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "পছন�দৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "ডাক সম�বন�ধীয়"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "পাৰ�চেল"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "চিনাক�তআখৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "উপনাম:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>অৱস�থান</b> (date) ত\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "তথ�য অন�ৰোধ কৰা হৈছে…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "গ�ৰাহক  তথ�য"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "সংস�কৰণ:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "গ�ৰাহক:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "দলসমূহ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2123,105 +2048,170 @@ msgstr ""
 "দলসমূহ যত আপ�নি �ই পৰিচয় উপস�থিত থকাটো বিচাৰে নিৰ�বাচন কৰক। মনব কৰিব যে আপ�নি "
 "�টাতকে বেছি দল অথবা কোনো দল নহয় নিৰ�বাচন কৰিব পাৰিব। "
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "দল যোগ কৰক (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "নিৰ�বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "দল"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "নিম�নলিখিত পৰিচয় প�ৰতিৰোধ কৰা হব:"
 msgstr[1] "নিম�নলিখিত পৰিচয়সমূহ প�ৰতিৰোধ কৰা হব:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "নিম�নলিখিত পৰিচয় প�ৰতিৰোধ কৰিব নোৱাৰি:"
 msgstr[1] "নিম�নলিখিত পৰিচয়সমূহ প�ৰতিৰোধ কৰিব নোৱাৰি:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "সংয�ক�ত পৰিচয়সমূহ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "নত�ন পৰিচয় পূৰ�বদৰ�শন"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "বাওফালে থকা তালিকাত নিৰ�বাচন কৰা পৰিচয়সমূহ �কেলগে সংয�ক�ত কৰা হব।"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "যোগাযোগ  তথ�য পৰিবৰ�তন কৰক"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "কল স�থাপনা কৰিবলে ব�যৱহাৰ কৰিব লগিয়া �কাওন�ট বাছক"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "কল"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "মবাইল"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "কৰ�ম"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HOME"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "পৰিচয় প�ৰতিৰোধ কৰক (_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "চেট (_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "SMS (_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "অডিঅ' কল (_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ভিডিঅ' কল (_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "পূৰ�ববৰ�তী কথোপকথনসমূহ (_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "নথিপত�ৰ পঠিয়াওক"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "মোৰ ডেস�কটপ অংশীদাৰী কৰক"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "পছন�দৰ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ইনস�টল নাই"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "পৰিচয় বিৱৰণসমূহ অভিগম কৰিবলে অন�গ�ৰহ কৰি gnome-contacts ইনস�টল কৰক।"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "তথ�য (_m)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "সম�পাদনা কৰক (_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "পৰিচয়সমূহ সংযোগ কৰক (_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "আপোনাক �ই ৰ�মলৈ আমন�ত�ৰণ জনোৱা হৈছে"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "চেট ৰ�মলৈ আমন�ত�ৰণ কৰক (_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "পৰিচয় যোগ কৰক (_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "মচি পেলাওক আৰ� প�ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "'%s' নামৰ দল নিশ�চিতৰূপে আ�তৰাবলৈ ইচ�ছ�ক নে ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "দল আ�তৰ�ৱা হৈছে"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "আ�তৰাওক (_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "আপ�নি নিশ�চিতৰূপে '%s' ক পৰিচিত তালিকাৰ পৰা আ�তৰাবলৈ ইচ�ছ�ক নে ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2230,7 +2220,11 @@ msgstr ""
 "আপ�নি স�চাকে সংয�ক�ত পৰিচয় '%s' আতৰাব বিচাৰে নে? মন কৰিব যে ই সকলো পৰিচয় যি �ই "
 "সংয�ক�ত পৰিচয় বনায় আতৰাই পেলাব।"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "পৰিচিত ব�যক�তিক আ�তৰ�ৱা হৈছে"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2239,25 +2233,25 @@ msgstr[1] "%u পৰিচয়সমূহ অনà§�তৰà§�ভà§�কà§�ত কà
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
-msgstr "<b>অৱস�থান</b> (date) -ত"
+msgstr "<b>অৱস�থান</b> (date) ত"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "�টা ফোন বা মবাইল ডিভাইচৰ পৰা অনলাইন"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "নত�ন নেটৱাৰ�ক"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "�টা IRC নেটৱাৰ�ক বাছক"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "নেটৱাৰ�কসমূহৰ তালিকা প�নৰ সংহতি কৰক (_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "নিৰ�বাচন কৰক"
@@ -2270,254 +2264,257 @@ msgstr "নত�ন চাৰ�ভাৰ"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "পৰিচয়সমূহ সংয�ক�ত কৰক"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "অসংয�ক�ত কৰক (_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "প�ৰদৰ�শিত সংয�ক�ত পৰিচয়সমূহক পৃথক পৰিচয়সমূহত সম�পূৰ�ণভাৱে বিভাজন কৰক।"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "সংয�ক�ত কৰক (_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "সংয�ক�ত পৰিচয়সমূহ '%s' অসংয�ক�ত কৰিব নে?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"আপ�নি নিশ�চিত নে আপ�নি �ই সংয�ক�ত পৰিচয়সমূহ অসংয�ক�ত কৰিব বিচাৰে? ই সংয�ক�ত পৰিচয়সমূহক "
-"সম�পূৰ�ণভাৱে পৃথক পৰিচয়সমূহত বিভাজন কৰিব।"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "অসংয�ক�ত কৰক (_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "ইতিহাস"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "দেখ�ৱাওক"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "অন�সন�ধান"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
-msgstr "%s -ত চেট কৰক"
+msgstr "%s ত চেট কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
-msgstr "%s -ৰ সৈতে চেট কৰক"
+msgstr "%s ৰ সৈতে চেট কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ছেকেণ�ড"
 msgstr[1] "%s ছেকেণ�ড"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s মিনিট"
 msgstr[1] "%s মিনিট"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr "কলে %s ললে, %s -ত সমাপ�ত হল"
+msgstr "কলে %s ললে, %s ত সমাপ�ত হল"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "আজি"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "যোৱাকালী"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "যেতিয়া তেতিয়া"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "যোনে-তোনে"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "কোন"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "কেতিয়া"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "যিকোনো বস�ত�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "লিখনী চেটসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "আগ'ত কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "বাহিৰগামি কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "মিচ কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "কি"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "আপ�নি নিশ�চিত নে আপ�নি পূৰ�বৱৰ�তী কথোপকথনৰ সকলো লগ মচি পেলাব বিচাৰে?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "সকলো পৰিষ�কাৰ কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "পৰা মচি পেলাওক:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">ল'ড কৰা হৈ আছে...</span>"
+msgid "_File"
+msgstr "নথিপত�ৰ (_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "চেট"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "সম�পাদনা (_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "সকলো ইতিহাস মচি পেলাওক..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "আলেখ�য"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "ভিডিঅ'"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "চেট"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "সম�পাদনা (_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ভিডিঅ'"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "নথিপত�ৰ (_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "পৃষ�ঠা ২"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "পৰিচয়ৰ ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ল'ড কৰা হৈ আছে...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "পৰিচয় অফলাইন"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "চেট (_h)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "ধাৰ�য�য কৰা পৰিচয় হয় অবৈধ অথবা অজ�ঞাত"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "পৰিচয় �ই ধৰণৰ কথোপকথন সমৰ�থন নকৰে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "অন�ৰোধ কৰা কাৰ�য�যকৰীতা �ই প�ৰটোকলৰ বাবে প�ৰণয়ন কৰা হোৱা নাই"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "প�ৰদান কৰা পৰিচয়ৰ সৈতে �টা কথোকথন আৰম�ভ কৰিব নোৱাৰি"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "আপোনাক �ই চেনেলৰ পৰা বহিষ�কাৰ কৰা হৈছে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "�ই চেনেল পূৰ�ণ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "আপ�নি �ই চেনেল অংশগ�ৰহণ কৰিবলে আমন�ত�ৰণ জনাব লাগিব"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "বিচ�ছিন�নিত অৱস�থাত আগবা�িব নোৱাৰি"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "অন�মতি নাকচ কৰা হৈছে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "কথোপকথন আৰম�ভ কৰোতে �টা ত�ৰ�টি হৈছিল"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "হয় �টা পৰিচয় চিনাক�তক অথবা ফোন নম�বৰ:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "নত�ন কথোপকথন "
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "ভিডিঅ' পঠাওক (_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "ভিডিঅ' কল (_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "কল (_a)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "অডিঅ' কল (_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "নত�ন কল"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "�কাওন�ট <b>%s</b> ৰ বাবে প�ৰমাণীকৰণ ব�যৰ�থ হল"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
-"�কাওন�ট <b>%s</b> -ৰ বাবে\n"
+"�কাওন�ট <b>%s</b> ৰ বাবে\n"
 "আপোনাৰ পাছৱাৰ�ড সোমাওক"
 
 #. COL_STATUS_TEXT
@@ -2548,12 +2545,8 @@ msgstr "à¦�ই অৱসà§�থা বাৰà§�তাক পছনà§�দৰ তà¦
 msgid "Set status"
 msgstr "অৱস�থা নিৰ�ধাৰণ কৰক"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "আপোনাৰ উপস�থিতি আৰ� বৰ�তমান অৱস�থাৰ তথ�য নিৰ�ধাৰণ কৰক"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "স�বনিৰ�বাচিত বাৰ�তাসমূহ…"
 
@@ -2561,7 +2554,7 @@ msgstr "স�বনিৰ�বাচিত বাৰ�তাসমূহ…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "নত�ন %s �কাওন�ট"
@@ -2571,20 +2564,20 @@ msgid "Find:"
 msgstr "সন�ধান কৰক:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "ফলা মিল খোৱাওক (_c)"
+msgid "_Previous"
+msgstr "পূৰ�ববৰ�তী (_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "বাক�যাংশ পোৱা নগল"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "পৰবৰ�তী (_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "ফলা মিল খোৱাওক (_c)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "পূৰ�ববৰ�তী (_P)"
+msgid "Phrase not found"
+msgstr "বাক�যাংশ পোৱা নগল"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2630,12 +2623,12 @@ msgstr "ভাষাৰ কল সমাপ�ত হৈছে"
 msgid "Edit Custom Messages"
 msgstr "স�বনিৰ�বাচিত বাৰ�তা সম�পাদনা"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
-msgstr "বাৰ�তা %s -ত সম�পাদনা কৰা হৈছে"
+msgstr "বাৰ�তা %s ত সম�পাদনা কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "স�বাভাৱিক"
 
@@ -2684,8 +2677,7 @@ msgid "The certificate is self-signed."
 msgstr "প�ৰমাণপত�ৰ স�ব-স�বাক�ষৰীত।"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr "প�ৰমাণপত�ৰক প�ৰেৰণকাৰী প�ৰমাণপত�ৰ কতৃপক�ষ দ�বাৰা প�ৰত�যাহাৰ কৰা হৈছে।"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2711,34 +2703,38 @@ msgid "Certificate hostname: %s"
 msgstr "প�ৰমাণপত�ৰ হস�টনাম: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "চলাই থাকক"
+msgid "C_ontinue"
+msgstr "চলাই থাকক (_o)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "ভৰষাহিন সংযোগ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "�ই সংযোগ ভৰষা কৰিব নোৱাৰি। আপ�নি তথাপিও আগবা�িব বিচাৰে নে?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "�ই পছন�দক ভৱিষ�যত সংযোগসমূহৰ বাবে মনত ৰাখিব"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "প�ৰমাণপত�ৰ বিৱৰণসমূহ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "URI খ�লিবলৈ ব�যৰ�থ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "�টা নথিপত�ৰ নিৰ�বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "নথিপত�ৰ সংৰক�ষণ কৰিবলে অপৰ�যাপ�ত ৰিক�ত স�থান"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2747,10 +2743,10 @@ msgstr ""
 "�ই নথিপত�ৰ সা�চিবলে %s ৰিক�ত স�থানৰ প�ৰয়োজন, কিন�ত� কেৱল %s উপলব�ধ। অন�গ�ৰহ কৰি অন�য "
 "অৱস�থান বাছক।"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
-msgstr "%s -ৰ পৰা আগ'ত নথিপত�ৰ"
+msgstr "%s ৰ পৰা আগ'ত নথিপত�ৰ"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2919,39 +2915,31 @@ msgstr "পশ�চিমি"
 msgid "Vietnamese"
 msgstr "ভিয়েতনামিছ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "নিৰ�বাচিত পৰিচয়ে নথিপত�ৰসমূহ গ�ৰহণ কৰিব নোৱাৰে।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "নিৰ�বাচিত পৰিচয় অফলাইন।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "কোনো ত�ৰ�টি বাৰ�তা নাই"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "তৎক�ষনাত বাৰ�তা (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "প�ৰাৰম�ভে সংযোগ স�থাপন কৰা নহব"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "আৰম�ভণিত পৰিচয় তালিকা বা অন�য কোনো ডাইলগ প�ৰদৰ�শন নকৰিব"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM গ�ৰাহক"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "�কাওন�ট ব�যৱস�থাপকৰ সৈতে সংযোগ কৰোতে ত�ৰ�টি"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2970,10 +2958,9 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Empathy �টা বিনাম�লিয়া চফ�টওৱেৰ; আপ�নি Free Software Foundation -ৰ দ�বাৰা "
-"প�ৰকাশিত GNU General Public License -ৰ চ�ক�তিসমূহৰ অন�তৰ�গত ইয়াক প�নৰ বিলাব পাৰিব "
-"অথবা সলনি  কৰিব পাৰিব; হৈতো লাইচেঞ�চৰ সংস�কৰণ ২, অথবা (আপ�নাৰ বিকল�পত) যিকোনো "
-"পৰৱৰ�তী সংস�কৰণ।"
+"Empathy �টা বিনাম�লিয়া চফ�টওৱেৰ; আপ�নি Free Software Foundation ৰ দ�বাৰা প�ৰকাশিত "
+"GNU General Public License ৰ চ�ক�তিসমূহৰ অন�তৰ�গত ইয়াক প�নৰ বিলাব পাৰিব অথবা সলনি  "
+"কৰিব পাৰিব; হৈতো লাইচেঞ�চৰ সংস�কৰণ ২, অথবা (আপ�নাৰ বিকল�পত) যিকোনো পৰৱৰ�তী সংস�কৰণ।"
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2992,237 +2979,97 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"আপ�নি হৈতো ইতিমধ�যে �ই প�ৰগ�ৰামৰ সৈতে GNU General Public License -ৰ কপি �টা "
+"আপ�নি হৈতো ইতিমধ�যে �ই প�ৰগ�ৰামৰ সৈতে GNU General Public License ৰ কপি �টা "
 "পাইছে। যদি নহয়,  Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-130159 USA -লে লিখক"
+"Floor, Boston, MA 02110-130159 USA লে লিখক"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ৰ সৈতে ব�যৱহাৰযোগ�য তৎক�ষনাত বাৰ�তাকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "অমিতাক�ষ ফ�কন (aphukan@fedoraproject.org), নীলমদ�য�তি গোস�বামী (ngoswami@redhat."
 "com)"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "�কাওন�টসমূহ ইমপোৰ�ট কৰোতে �টা ত�ৰ�টি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "�কাওন�ট বিৱৰণসমূহ বিশ�লেষণ কৰোতে �টা ত�ৰ�টি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "�কাওন�ট সৃষ�টি কৰোতে �টা ত�ৰ�টি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "�টা ত�ৰ�টি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "ত�ৰ�টি বাৰ�তা আছিল: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"আপ�নি হয় উভতি যাব পাৰে আৰ� আপোনাৰ �কাওন�ট বিৱৰনসমূহ প�নৰ সোমোৱাৰ চেষ�টা কৰিব পাৰে "
-"অথবা �ই সহায়ক প�ৰস�থান কৰক আৰ� �কাওন�টসমূহ পিছত সম�পাদনা মেন�ৰ পৰা যোগ কৰক।"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "�টা ত�ৰ�টি দেখা দিছে"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "চেটৰ কি ধৰনৰ �কাওন�ট উপস�থিত আছে?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "প�ৰস�ত�ত কৰাৰ উদ�দেশ�যে অন�য কোনো চেটৰ �কাওন�ট উপস�থিত আছে নেকি ?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "আপোনাৰ �কাওন�টৰ বিবৰণ ইয়াত লিখক"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "কি ধৰনৰ চেটৰ �কাওন�ট আপ�নি নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক ?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "চেটৰ অন�য �কাওন�ট নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক নেকি?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "নত�ন �কাওন�টৰ বিৱৰণ লিখক"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy -ৰ সৈতে আপ�নি কাষৰীয়া মান�হ আৰ� বন�ধ�সকল আৰ� সহকৰ�মীসকল যোনে Google Talk, "
-"AIM, Windows Live আৰ� অন�য বহতো চেট প�ৰগ�ৰামসমূহ ব�যৱহাৰ কৰে সিহতৰ লগত অনলাইন চেট "
-"কৰিব পাৰিব। �টা মাক�ৰোফোন অথবা �টা ৱেবকেমৰ সৈতে আপ�নি অডিঅ' অথবা ভিডিঅ' কলসমূহ "
-"কৰিব পাৰিব।"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"অন�য কোনো চেটৰ প�ৰোগ�ৰামৰ সৈতে ব�যৱহৃত হৈছে �নে কোনো �কাওন�ট কি বৰ�তমানে উপস�থিত আছে?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "হয়, চিহ�নিত স�থানৰ পৰা মোৰ �কাওন�টৰ তথ�য ইমপোৰ�ট কৰা হ'ব "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "হয়, মোৰ �কাওন�টৰ তথ�য মই �তিয়ায় লিখিবলৈ ইচ�ছ�ক"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "নহয়, মই নত�ন �কাওন�ট প�ৰাপ�ত কৰিবলৈ ইচ�ছ�ক"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "নহয়, বৰ�তমানে মই অকল ওচৰৰ ব�যক�তিৰ তথ�য চাবলৈ ইচ�ছ�ক"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ইমপোৰ�ট কৰাৰ উদ�দেশ�যে �কাওন�ট নিৰ�বাচন কৰক:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "হয়"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "নহয়, �তিয়াৰ কাৰণে �ইয়াই"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy -� আপ�নি থকা নেটৱাৰ�কত সংয�ক�ত থকা মান�হবোৰক স�বচালিতভাৱে খোজ কৰি চেট কৰিব "
-"পাৰে। যদি আপ�নি �ই বৈশিষ�ট ব�যৱহাৰ কৰিব বিচাৰে, অন�গ�ৰহ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
-"আছে নে নিৰীক�ষণ কৰক। আপ�নি সহজতে �ই বিৱৰণসমূহ পিছত সলনি কৰিব পাৰিব বা �ই বৈশিষ�ট "
-"'Accounts' ডাইলগ ব�যৱহাৰ কৰি অসামৰ�থবান কৰিব পাৰিব"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "সম�পাদনা কৰক -> �কাওন�টসমূহ"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "মই �ই বৈশিষ�ট �তিয়ায় সামৰ�থবান কৰিব নিবিচাৰো (_n)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"আপ�নি আপোনাৰ স�থানীয় নেটৱাৰ�কত সংয�ক�ত মান�হবোৰৰ লগত চেট কৰিব নোৱাৰিব কাৰণ, "
-"telepathy-salut ইনস�টল নাই। যদি আপ�নি �ই বৈশিষ�ট সামৰ�থবান কৰিব বিচাৰে, অন�গ�ৰহ "
-"কৰি telepathy-salut পেকেইজ ইনস�টল কৰক আৰ� �কাওন�টসমূহ ডাইলগৰ পৰা �টা কাষৰীয়া "
-"মান�হবোৰ �কাওন�ট সৃষ�টি কৰক"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ইনস�টল নাই"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ সহায়ক"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Empathy লৈ স�বাগতম"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "আপোনাৰ উপস�থিত �কাওন�ট ইমপোৰ�ট কৰক"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "অন�গ�ৰহ কৰি ব�যক�তিগত বিৱৰণসমূহ সোমাওক"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "আপোনাৰ %s �কাওন�টত অসংৰক�ষীত পৰিৱৰ�তনসমূহ আছে।"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "আপোনাৰ নত�ন �কাওন�ট �তিয়াও সংৰক�ষণ কৰা হোৱা নাই"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "সংযোগ কৰা হৈ আছে…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "অফলাইন— %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "বিচ�ছিন�নিত — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "অফলাইন — কোনো নেটৱাৰ�ক সংযোগ নাই"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "অজ�ঞাত অৱস�থা"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"�ই �কাওন�ট অসামৰ�থবান কৰা হৈছে কাৰণ ই �টা প�ৰনি, অসমৰ�থিত বেক�ণ�ডৰ উপৰত নিৰ�ভৰশীল। "
+"আপোনাৰ �কাওন�ট প�ৰব�ৰজন কৰিবলে অন�গ�ৰহ কৰি telepathy-haze ইনস�টল কৰক আৰ� আপোনাৰ "
+"অধিবেশন প�নৰাম�ভ কৰক।"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "অফলাইন — �কাওন�ট অসামৰ�থবান"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"আপ�নি �টা নত�ন �কাওন�ট সৃষ�টি কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ�তনসমূহ\n"
-"আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "সংযোগ প�ৰাচলসমূহ সম�পাদন কৰক"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "চাৰ�ভাৰৰ পৰা আপোনাৰ ব�যক�তিগত তথ�য উদ�ধাৰ কৰিবলে ব�যৰ�থ।"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "আপোনাৰ ব�যক�তিগত তথ�য সম�পাদন কৰিবলে অনলাইন যাওক।"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "সংযোগ প�ৰাচলসমূহ সম�পাদন কৰক (_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
-msgstr "আপ�নি %s -ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
+msgstr "আপ�নি %s ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "ই চাৰ�ভাৰত আপোনাৰ �কাওন�টক আতৰাই নিদিয়ে।"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3231,15 +3078,23 @@ msgstr ""
 "আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "সামৰ�থবান কৰক (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "অসামৰ�থবান কৰক (_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "বাদ দিয়ক (_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "সংযোগ কৰক (_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3251,19 +3106,15 @@ msgstr ""
 msgid "Add…"
 msgstr "যোগ কৰক…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "�কাওন�ট তথ�য ল'ড কৰা হৈ আছে"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "কোনো প�ৰটোকল সংস�থাপন কৰা নহয়"
+msgid "_Import…"
+msgstr "ইমপোৰ�ট কৰক (_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "প�ৰটোকল:"
+msgid "Loading account information"
+msgstr "�কাওন�ট তথ�য ল'ড কৰা হৈ আছে"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3271,148 +3122,132 @@ msgstr ""
 "নত�ন �কাওন�ট যোগ কৰাৰ বাবে, প�ৰথমে ব�যৱহাৰযোগ�য প�ৰতি প�ৰটোকলৰ বাবে �টা বেক লৈন�ড "
 "সংস�থাপন কৰা আৱশ�যক।"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "ইমপোৰ�ট কৰক (_I)..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "কোনো প�ৰটোকল বেক�ণ�ড ইনস�টল নাই"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy প�ৰমাণীকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy প�ৰমাণীকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "ওচৰৰ ব�যক�তিৰ"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy অডিঅ'/ভিডিঅ' ক�লা�ন�ট"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy অডিঅ'/ভিডিঅ' ক�লা�ন�ট"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "বৈপৰিত�য"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "উজ�জ�বলতা"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "গামা"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "ধ�বনি"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "কাষ-বাৰ (_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "অডিঅ' ইনপ�ট"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "ভিডিঅ' ইনপ�ট"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "ডায়েল-পেড"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "বিৱৰণসমূহ"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "%s ৰ সৈতে কল"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "মেচিনে দেখা দৰে IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ইন�টাৰনেটত �টা চাৰ�ভাৰে দেখা দৰে IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "অন�য কাষে দেখা ধৰণে সমনীয়াৰ IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "�টা প�ৰেৰণ চাৰ�ভাৰৰ IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "মাল�টিকাস�ট দলৰ IP ঠিকনা"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "অজ�ঞাত"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "অজ�ঞাত"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "অজ�ঞাত"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "অজ�ঞাত"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "সংযোগেৰ অবকাল — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "কাৰিকৰী বিৱৰণসমূহ"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr "%s -ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো অডিঅ' বিন�যাস ব�জি নাপায়"
+msgstr "%s ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো অডিঅ' বিন�যাস ব�জি নাপায়"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr "%s -ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো ভিডিঅ' বিন�যাস ব�জি নাপায়"
+msgstr "%s ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো ভিডিঅ' বিন�যাস ব�জি নাপায়"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3421,25 +3256,23 @@ msgstr ""
 "%s লে �টা সংযোগ স�থাপন কৰিব নোৱাৰে। আপোনা লোকৰ �জন হয়তো �নে নেটৱাৰ�কত আছে যি "
 "প�ৰত�যক�ষ সংযোগসমূহৰ অন�মতি নিদিয়ে।"
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "নেটৱাৰ�কত �টা ব�যৰ�থতা হৈছিল"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "�ই কলৰ বাবে প�ৰয়োজনীয় অডিঅ' বিন�যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস�টল নাই"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "�ই কলৰ বাবে ভিডিঅ' বিন�যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস�টল নাই"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3449,262 +3282,309 @@ msgstr ""
 "কিবা অপ�ৰত�যাশিত �টা Telepathy উপাদানত ঘটিছে। অন�গ�ৰহ কৰি <a href=\"%s\">�ই বাগ "
 "সংবাদন কৰক</a> আৰ� সহায় মেন�ৰ 'ডিবাগ' উইন�ডোৰ পৰা সংগ�ৰহ কৰা লগসমূহ �টাচ কৰক।"
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "কল ইঞ�জীনত �টা ব�যৰ�থতা হৈছিল"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "স�ট�ৰিমৰ অন�ত পোৱা গল"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "অডিঅ' স�ট�ৰিম স�থাপনা কৰিব নোৱাৰি"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "ভিডিঅ' স�ট�ৰিম স�থাপনা কৰিব নোৱাৰি"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "অডিঅ'"
+msgid "_Call"
+msgstr "কল (_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
+msgid "_Microphone"
+msgstr "মাক�ৰোফোন (_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "কেমেৰা অসামৰ�থবান কৰক"
+msgid "_Camera"
+msgstr "কেমেৰা (_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "ডায়েলপেড প�ৰদৰ�শন কৰক"
+msgid "_Settings"
+msgstr "সংহতিসমূহ (_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "কডেক �নক'ড কৰা হৈ আছে:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "প�ৰদৰ�শন (_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "বিচ�ছিন�ন কৰক"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "সহায় (_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "বৰ�তমান কল হেঙআপ কৰক"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "সূচী (_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "স�থানীয় প�ৰাৰ�থী:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "ডিবাগ কৰক (_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "মোক ডাঙৰ কৰক"
+msgid "Swap camera"
+msgstr "কেমেৰা স�বাপ কৰক"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "মোক সৰ� কৰক"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "দূৰৱৰ�তী প�ৰাৰ�থী:"
+msgid "Maximise me"
+msgstr "মোক ডাঙৰ কৰক"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "অডিঅ' পঠিয়াওক"
+msgid "Disable camera"
+msgstr "কেমেৰা অসামৰ�থবান কৰক"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "ভিডিঅ' পঠাওক"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "বিচ�ছিন�ন কৰক"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "ডায়েলপেড দেখ�ৱাওক"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "বৰ�তমান কল হেঙআপ কৰক"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "ভিডিঅ' কল "
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "�টা ভিডিঅ' কল আৰম�ভ কৰক"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "�টা অডিঅ' কল আৰম�ভ কৰক"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "কেমেৰা স�বাপ কৰক"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
+msgid "Show dialpad"
+msgstr "ডায়েলপেড দেখ�ৱাওক"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "অজ�ঞাত"
+msgid "Display the dialpad"
+msgstr "ডায়েলপেড প�ৰদৰ�শন কৰক"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "ভিডিঅ' পঠাওক"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "ভিডিঅ' কল "
+msgid "Toggle video transmission"
+msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "কল (_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "অডিঅ' পঠিয়াওক"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "কেমেৰা (_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "সূচী (_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "ডিবাগ কৰক (_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "কডেক �নক'ড কৰা হৈ আছে:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "সহায় (_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "মাক�ৰোফোন (_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "দূৰৱৰ�তী প�ৰাৰ�থী:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "সংহতিসমূহ (_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "স�থানীয় প�ৰাৰ�থী:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "প�ৰদৰ�শন (_V)"
+msgid "Audio"
+msgstr "অডিঅ'"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "�ই উইন�ডো বন�ধ কৰিব নে?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"�ই উইন�ডো বন�ধ কৰিলে %s অৱশিষ�ট থাকিব। আপ�নি ইয়াক প�নৰ অংশগ�ৰহণ নকৰিলে ততোধিক "
+"বাৰ�তাসমূহ নাপাব।"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"�ই উইন�ডো বন�ধ কৰিলে �টা চেট ৰ�ম বাদ দিয়া হব। আপ�নি ইয়াক প�নৰ অংশগ�ৰহণ নকৰা লৈকে "
+"কোনো ততোধিক বাৰ�তা নাপাব।"
+msgstr[1] ""
+"�ই উইন�ডো বন�ধ কৰিলে %u চেট ৰ�মসমূহ বাদ দিয়া হব। আপ�নি ইহতক প�নৰ অংশগ�ৰহণ নকৰা লৈকে "
+"কোনো ততোধিক বাৰ�তা নাপাব।"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s �ৰিব নে?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "আপ�নি �ই চেট ৰ�ম প�নৰঅংশগ�ৰহণ নকৰালৈকে কোনো ততোধিক বাৰ�তা নাপাব।"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "উইন�ডো বন�ধ কৰক"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "ৰ�ম �ৰি দিওক"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d প�া হোৱা নাই)"
 msgstr[1] "%s (%d প�া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (আৰ� %u অন�য)"
 msgstr[1] "%s (আৰ� %u অন�য)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d অন�যৰ পৰা প�া হোৱা নাই)"
 msgstr[1] "%s (%d অন�যৰ পৰা প�া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d সকলোৰ পৰা প�া হোৱা নাই)"
 msgstr[1] "%s (%d সকলোৰ পৰা প�া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d বাৰ�তা পঠোৱা হৈ আছে"
 msgstr[1] "%d বাৰ�তাসমূহ পঠোৱা হৈ আছে"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "বাৰ�তা লিখা হৈছে।"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "আ�তৰাওক (_l)"
+msgid "_Conversation"
+msgstr "কথোপকথন (_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "পৰিচয় (_o)"
+msgid "C_lear"
+msgstr "আ�তৰাওক (_l)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "স�মাইলি যোগ কৰক (_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "জনপ�ৰিয় চেট ৰ�ম (_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "প�ৰতিযোগীক আমন�ত�ৰণ দিয়ক (_P)…"
+msgid "Notify for All Messages"
+msgstr "সকলো বাৰ�তাৰ বাবে অধিসূচনা দিয়ক"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "টেব বাও�ফালে নিয়ক (_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "টেব সো�ফালে নিয়ক (_R)"
+msgid "Invite _Participant…"
+msgstr "প�ৰতিযোগীক আমন�ত�ৰণ দিয়ক (_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "সকলো বাৰ�তাৰ বাবে অধিসূচনা দিয়ক"
+msgid "C_ontact"
+msgstr "পৰিচয় (_o)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "কথোপকথন (_C)"
+msgid "_Tabs"
+msgstr "টেব (_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "টেব বিচ�ছিন�ন কৰক (_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "জনপ�ৰিয় চেট ৰ�ম (_F)"
+msgid "_Previous Tab"
+msgstr "পূৰ�ববৰ�তী টেব (_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "পৰবৰ�তী টেব (_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "পূৰ�ববৰ�তী টেব (_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "টেব বন�ধ বাতিল কৰক (_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "টেব বাও�ফালে নিয়ক (_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "টেব (_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "টেব সো�ফালে নিয়ক (_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "টেব বন�ধ বাতিল কৰক (_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "টেব বিচ�ছিন�ন কৰক (_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3718,100 +3598,100 @@ msgstr "ৰ�ম"
 msgid "Auto-Connect"
 msgstr "স�বয়ংক�ৰিয়-সংযোগ"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "পছন�দৰ ৰ�ম পৰিচয়লনা কৰক"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "আগমনকৰ�তা কল"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s -� আপোনাক ভিডিঅ' কল কৰি আছে। আপ�নি উত�তৰ দিব বিচাৰে নে?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s -� আপোনাক কল কৰি আছে। আপ�নি উত�তৰ দিব বিচাৰে নে?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%sৰ পৰা আগমনকৰ�তা কল"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "প�ৰত�যাখ�যান কৰক (_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "উত�তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "ভিডিঅ'ৰ সৈতে উত�তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "%s -ৰ পৰা আগ'ত ভিডিঅ' কল"
+msgstr "%s ৰ পৰা আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "ৰ�মৰ আমন�ত�ৰণ"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "%s -ত যোগদান দিবলে আমন�ত�ৰণ"
+msgstr "%s ত যোগদান দিবলে আমন�ত�ৰণ"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s � আপোনাক %s লৈ আমন�ত�ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "প�ৰত�যাখ�যান কৰক (_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "যোগ কৰক (_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s � আপোনাক %s লৈ আমন�ত�ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "আপোনাক %s -ত যোগদান দিবলে আমন�ত�ৰণ জনোৱা হৈছে"
+msgstr "আপোনাক %s ত যোগদান দিবলে আমন�ত�ৰণ জনোৱা হৈছে"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s দ�বাৰা প�ৰৰিত নথিপত�ৰ আগত"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "পাছৱাৰ�ডৰ প�ৰয়োজন"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "আপ�নি কেতিয়া অনলাইন আছে চাবলে %s -� অন�মতি বিচাৰিব"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3821,105 +3701,105 @@ msgstr ""
 "বাৰ�তা: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "অজ�ঞাত"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, %s ৰ %s/s ত"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s, ম�ঠ %s ৰ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" প�ৰাপ�ত কৰা হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" পঠিওৱা হৈছে, %s ক"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" প�ৰাপ�ত কৰিবলৈ সমস�যা, %sৰ পৰা আগত"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "নথিপত�ৰ প�ৰাপ�ত কৰিবলৈ সমস�যা"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" ক %s লৈ পঠিয়াবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "নথিপত�ৰ পঠিয়াবলৈ সমস�যা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" প�ৰাপ�ত হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" প�ৰৰিত হৈছে, %s ক"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "নথিপত�ৰ স�থানান�তৰ সম�পূৰ�ণ হৈছে"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "অন�য ব�যৱহাৰকাৰীৰ প�ৰতিক�ৰিয়াৰ অপেক�ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ৰ অখণ�ডতা পৰীক�ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\" হেশ�ব কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "নথিপত�ৰ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "অবশিষ�ট"
 
@@ -3931,179 +3811,209 @@ msgstr "নথিপত�ৰ স�থানান�তৰ"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "সমাপ�ত, বাতিল আৰ� বিফল নথিপত�ৰ স�থানান�তৰৰ তথ�য �ই তালিকাৰ পৰা আ�তৰ�ৱা হ'ব"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "ইমপোৰ�ট কৰক (_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"ইমপোৰ�ট কৰিবলে কোনো �কাওন�ট পোৱা নগল। Empathy -� বৰ�তমানে কেৱল Pidgin -ৰ পৰা "
+"ইমপোৰ�ট কৰিবলে কোনো �কাওন�ট পোৱা নগল। Empathy -� বৰ�তমানে কেৱল Pidgin ৰ পৰা "
 "�কাওন�টসমূহ ইমপোৰ�ট কৰা সমৰ�থন কৰে।"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "�কাওন�ট ইমপোৰ�ট কৰক"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ইমপোৰ�ট"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "প�ৰটোকল"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "উৎস"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "পাছৱাৰ�ড প�ৰদান কৰক"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "বিচ�ছিন�ন কৰক"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "আপ�নি ইয়াত পৰিচয়সমূহ চাবলে �টা �কাওন�ট সংস�থাপন কৰিব লাগিব।"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "কোনো মিল পোৱা নগল"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"ক�ষমা কৰিব, %s �কাওন�টসমূহ ব�যৱহাৰ কৰিব নোৱাৰি যেতিয়ালৈকে %s চফ�টৱেৰ ব�যৱহাৰ কৰা "
+"নহয়।"
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "চফ�টৱেৰ আপডেইট কৰক..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "বন�ধ কৰক"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "প�নৰ সংযোগ কৰক"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "�কাওন�ট সম�পাদন কৰক"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "বন�ধ কৰক"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "টপ আপ %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "টপ আপ �কাওন�ট দেনা"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "টপ আপ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "পৰিচিত ব�যক�তি"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "আপ�নি পৰিচয়সমূহ ইয়াত চাবলে আপোনাৰ �কাওন�টসমূহৰ �টা সামৰ�থবান কৰিব লাগিব।"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "আপ�নি পৰিচয়সমূহ ইয়াত চাবলে %s সামৰ�থবান কৰিব লাগিব।"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "পৰিচিত ব�যক�তিৰ তালিকা"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "মানচিত�ৰত পৰিচয়ৰ তথ�য (_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�কাওন�ট সংহতিসমূহ"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "দেনা অৱশিষ�ট"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "নত�ন কথোপকথন (_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "পৰিচয় তালিকাত সন�ধান কৰক (_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "নত�ন কল (_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "জনপ�ৰিয়সমূহত যোগ দিন (_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "পৰিচয়সমূহৰ বাবে সন�ধান কৰক (_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "জনপ�ৰিয় মান পৰিচয়লনা"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "নথিপত�ৰ স�থানান�তৰসমূহ (_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "স�বাভাবিক মাপ (_o)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "অফ-লাইন পৰিচয় (_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "নত�ন কল (_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "অৱতাৰ সহযোগে স�বাভাবিক মাপ (_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "দেনা অৱশিষ�ট"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "মানচিত�ৰত পৰিচয়ৰ তথ�য (_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "�কাওন�টসমূহ (_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "প�ৰতিৰোধিত পৰিচয়সমূহ (_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "পছন�দসমূহ (_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "পৰিচয় তালিকাত সন�ধান কৰক (_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "নাম অন�যায়ী সজাওক (_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "অৱস�থা অন�যায়ী সজাওক (_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "�কাওন�টসমূহ (_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "অৱতাৰ সহযোগে স�বাভাবিক মাপ (_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "প�ৰতিৰোধিত পৰিচয়সমূহ (_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "স�বাভাবিক মাপ (_o)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "সংক�চিত মাপ (_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "নথিপত�ৰ স�থানান�তৰসমূহ (_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "ৰ�ম (_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "যোগদান কৰক (_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "নত�ন কথোপকথন (_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "অফ-লাইন পৰিচয় (_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "ব�যক�তিগত তথ�য (_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "ৰ�ম (_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "জনপ�ৰিয়সমূহত যোগ দিন (_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "পৰিচয়সমূহৰ বাবে সন�ধান কৰক (_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "জনপ�ৰিয় মান পৰিচয়লনা"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "চেট ৰ�ম"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "সদস�যবৃন�দ"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4116,31 +4026,39 @@ msgstr ""
 "পাছৱাৰ�ডৰ প�ৰয়োজন: %s\n"
 "সদস�যসমূহ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "হয়"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "নহয়"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ৰ�মৰ তালিকা নিৰ�মাণ কৰিবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ৰ�মৰ তালিকা নিৰ�মাণ বন�ধ কৰিবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ৰ�মৰ তালিকা ল'ড কৰিবলৈ ব�যৰ�থ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ৰ�মত যোগ দিয়ক"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "ইয়াত যোগদান কৰিবলে ৰ�মৰ নাম সোমাওক অথবা তালিকাত থকা �টা বা অধিক ৰ�মসমূহত ক�লিক "
 "কৰক।"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ৰ�ম: (_R)"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4148,504 +4066,822 @@ msgstr ""
 "ৰ�মক হস�ট কৰা চাৰ�ভাৰ সোমাওক, অথবা ইয়াক ৰিক�ত �ৰক যদি ৰ�ম বৰ�তমান �কাওন�টৰ চাৰ�ভাৰত "
 "আছে"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ৰ�মত যোগ দিয়ক"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ৰ�মৰ তালিকা ল'ড কৰিবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ৰ�মৰ তালিকা"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ৰ�ম: (_R)"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "প�ৰাপ�ত বাৰ�তা"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "বাৰ�তা পঠিওৱা হৈছে"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "নত�ন কথোপকথন"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "পৰিচয় অন-লাইন আহিছে"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "পৰিচয় অন-লাইন আহে"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "পৰিচয় অফ-লাইন হৈছে"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "�কাওন�ট সংয�ক�ত কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "�কাওন�টৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "ভাষা"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "জ�লিয়েট"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ৰোমিও"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "অ ৰোমিও, ৰোমিও, ত�মি ক'ত আছা ৰোমিও?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "তোমাৰ দেউতাক অস�বীকাৰ কৰা আৰ� তোমাৰ নামক মানি নলবা;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "অথবা যদি �নে নকৰা, মোৰ প�ৰেমৰ প�ৰতিজ�ঞা লোৱা"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "আৰ� মই আৰ� Capulet হৈ নাথাকিম।"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "মই আৰ� শ�নিম, নে ইয়াত কিবা কম?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "জ�লিয়েট -� সংযোগ বিচ�ছিন�নিত কৰিছে"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "পছন�দ"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "ছবি ৰূপে স�মাইলি প�ৰদৰ�শন কৰা হ'ব (_s)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "ৰ�মত পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_l)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "চেহেৰা ছবি"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "আচৰণ"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "চেট আৰম�ভ কৰিব:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "চেটৰ থীম: (_e)"
+msgid "new ta_bs"
+msgstr "নত�ন টেবসমূহ (_b)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে সূচনাপ�ৰদানৰ ব�যৱস�থা নিষ�ক�ৰিয় কৰা হ'ব (_a)"
+msgid "new _windows"
+msgstr "নত�ন উইন�ডোসমূহ (_w)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে শব�দ নিষ�ক�ৰিয় কৰা হ'ব (_a)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "আগ'ত ঘটনাসমূহক অধিসূচনা স�থানত প�ৰদৰ�শন কৰক"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "আৰম�ভত স�বচালিতভাৱে সংযোগ কৰক (_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"প�ৰতিধ�বনি বাতিল কৰায় আপোনাৰ কন�ঠক অন�য ব�যক�তিয়ে স�পষ�ট শ�নিবলে সহায় কৰে, কিন�ত� "
-"কিছ�মান কমপিউটাৰত সমস�যা সৃষ�টি কৰিব পাৰে। যদি আপ�নি অথবা অন�য মান�হজনে কলৰ সমূয়ত "
-"অদ�ভ�ত শব�দ বা খেৰখেৰনি শ�নে, প�ৰতিধ�বনি বাতিল কৰা বন�ধ কৰি কল প�নৰাম�ভ কৰি চাওক।"
+msgid "Log conversations"
+msgstr "লগ কথোপকথনসমূহ"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "পৰিচিত ব�যক�তি অন-লাইন আহিলে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
+msgid "Behavior"
+msgstr "আচৰণ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "পৰিচিত ব�যক�তি অফ-লাইন হ'লে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
+msgid "General"
+msgstr "সাধাৰণ"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "চেট মনোনিবেশিত নথকাত অধিসূচনাসমূহ সামৰ�থবান কৰক (_c)"
+msgid "_Enable bubble notifications"
+msgstr "বাবল দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "চিহ�নিত ভাষাসমূহৰ বাবে বানান পৰীক�ষণ সামৰ�থবান কৰক:"
+msgid "Disable notifications when _away or busy"
+msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে সূচনাপ�ৰদানৰ ব�যৱস�থা নিষ�ক�ৰিয় কৰা হ'ব (_a)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "সাধাৰণ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "চেট মনোনিবেশিত নথকাত অধিসূচনাসমূহ সামৰ�থবান কৰক (_c)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "ইনপ�ট স�তৰ:"
+msgid "Enable notifications when a contact comes online"
+msgstr "পৰিচিত ব�যক�তি অন-লাইন আহিলে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "ইনপ�ট ভলিউম:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "পৰিচিত ব�যক�তি অফ-লাইন হ'লে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "সূচনাবাৰ�তা"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "অৱস�থান উৎসসমূহ:"
+msgid "_Enable sound notifications"
+msgstr "শব�দ দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "লগ কথোপকথনসমূহ"
+msgid "Disable sounds when _away or busy"
+msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে শব�দ নিষ�ক�ৰিয় কৰা হ'ব (_a)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "সূচনাবাৰ�তা"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "বিভিন�ন ঘটনাৰ বাবে শব�দ বজাওক"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "শব�দ"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "গোপনীয়তা"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "কলৰ গ�ণ উন�নত কৰিবলে প�ৰতিধ�বনি বাতিল ব�যৱহাৰ কৰক (_e)"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"কমোৱা অৱস�থান সঠিকতায় ব�জায় যে আপোনাৰ শহৰ, ৰাজ�য আৰ� দেশৰ বাহিৰে আৰ� �কো প�ৰকাশ "
-"কৰা নহব। GPS অক�ষসমূহ ই দশমিক লৈকে সঠিক হব।"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "ছবি ৰূপে স�মাইলি প�ৰদৰ�শন কৰা হ'ব (_s)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "ৰ�মত পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_l)"
+"প�ৰতিধ�বনি বাতিল কৰায় আপোনাৰ কন�ঠক অন�য ব�যক�তিয়ে স�পষ�ট শ�নিবলে সহায় কৰে, কিন�ত� "
+"কিছ�মান কমপিউটাৰত সমস�যা সৃষ�টি কৰিব পাৰে। যদি আপ�নি অথবা অন�য মান�হজনে কলৰ সমূয়ত "
+"অদ�ভ�ত শব�দ বা খেৰখেৰনি শ�নে, প�ৰতিধ�বনি বাতিল কৰা বন�ধ কৰি কল প�নৰাম�ভ কৰি চাওক।"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "শব�দ"
+msgid "_Publish location to my contacts"
+msgstr "পৰিচিত ব�যক�তিৰ অৱস�থান প�ৰকাশ কৰা হ'ব (_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "বানান পৰীক�ষণ"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"ভাষাসমূহৰ তালিকায় কেৱল সেই ভাষাসমূহ যাৰ বাবে আপোনাৰ �টা শব�দকোষ ইনস�টল আছে "
-"সেইসমূহ প�ৰতিফলন কৰে।"
+"কমোৱা অৱস�থান সঠিকতায় ব�জায় যে আপোনাৰ শহৰ, ৰাজ�য আৰ� দেশৰ বাহিৰে আৰ� �কো প�ৰকাশ "
+"কৰা নহব। GPS অক�ষসমূহ ই দশমিক লৈকে সঠিক হব।"
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "থীমসমূহ"
+msgid "_Reduce location accuracy"
+msgstr "অৱস�থান সঠিকতা কম কৰক (_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "অপৰ:"
+msgid "Privacy"
+msgstr "গোপনীয়তা"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "আৰম�ভত স�বচালিতভাৱে সংযোগ কৰক (_A)"
+msgid "_GPS"
+msgstr "GPS (_G)"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "চেলফোন (_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "বাবল দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "নেটৱাৰ�ক (IP, Wi-Fi) (_N)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "শব�দ দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "GPS (_G)"
+msgid "Location sources:"
+msgstr "অৱস�থান উৎসসমূহ:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "নেটৱাৰ�ক (IP, Wi-Fi) (_N)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ভাষাসমূহৰ তালিকায় কেৱল সেই ভাষাসমূহ যাৰ বাবে আপোনাৰ �টা শব�দকোষ ইনস�টল আছে "
+"সেইসমূহ প�ৰতিফলন কৰে।"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "নত�ন চেটসমূহ পৃথক উইন�ডোত খোলা হ'ব (_O)"
+msgid "Enable spell checking for languages:"
+msgstr "চিহ�নিত ভাষাসমূহৰ বাবে বানান পৰীক�ষণ সামৰ�থবান কৰক:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "পৰিচিত ব�যক�তিৰ অৱস�থান প�ৰকাশ কৰা হ'ব (_P)"
+msgid "Spell Checking"
+msgstr "বানান পৰীক�ষণ"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "চেটৰ থীম: (_e)"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "অৱস�থান সঠিকতা কম কৰক (_R)"
+msgid "Variant:"
+msgstr "অপৰ:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "থীমসমূহ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "অৱস�থা"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "প�ৰস�থান (_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "পৰিচয়ক আকো কল কৰক"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "কেমেৰা বন�ধ কৰক"
+msgid "Redial"
+msgstr "প�নঃ ডায়েল কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "কেমেৰা অন কৰক"
+msgid "V_ideo"
+msgstr "ভিডিঅ' (_i)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ভিডিঅ' বন�ধ কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "কেমেৰা অসামৰ�থবান কৰক আৰ� ভিডিঅ' পঠোৱা বন�ধ কৰক"
+msgid "Video Preview"
+msgstr "ভিডিঅ' পূৰ�বদৰ�শন কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "কেমেৰা সামৰ�থবান কৰক আৰ� ভিডিঅ' পঠাওক"
+msgid "Video On"
+msgstr "ভিডিঅ' অন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "কেমেৰা সামৰ�থবান কৰক কিন�ত� ভিডিঅ' নপঠাব"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "পৰিচয়ক আকো কল কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "পূৰ�বদৰ�শন কৰক"
+msgid "Camera Off"
+msgstr "কেমেৰা বন�ধ কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "প�নঃ ডায়েল কৰক"
+msgid "Disable camera and stop sending video"
+msgstr "কেমেৰা অসামৰ�থবান কৰক আৰ� ভিডিঅ' পঠোৱা বন�ধ কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "ভিডিঅ' (_i)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "পূৰ�বদৰ�শন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "ভিডিঅ' বন�ধ কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "কেমেৰা সামৰ�থবান কৰক কিন�ত� ভিডিঅ' নপঠাব"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "ভিডিঅ' অন কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "কেমেৰা অন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ভিডিঅ' পূৰ�বদৰ�শন কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "কেমেৰা সামৰ�থবান কৰক আৰ� ভিডিঅ' পঠাওক"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Map View ৰ সৈতে সংযোগ স�থাপন কৰক"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "সংৰক�ষণ"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "পেইস�টবিন সংযোগ"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "পেইস�টবিন প�ৰতিক�ৰিয়া"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "তথ�য �টা পেইস�টৰ বাবে অতি ডাঙৰ। অন�গ�ৰহ কৰি লগসমূহ নথিপত�ৰত সংৰক�ষণ কৰক।"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "ডিবাগ উইন�ডো"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "পেইস�টবিনলে পঠাওক"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "স�থগিত কৰক"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "স�তৰ "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "ডিবাগ"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "তথ�য"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "বাৰ�তা"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "সতৰ�কবাৰ�তা"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "গ�ৰ�ত�বপূৰ�ণ"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "ত�ৰ�টি"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "সময়"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "ডোমেইন"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "শ�ৰেণী"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "স�তৰ"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "নিৰ�বাচিত সংযোগ ব�যৱস�থাপকে দূৰৱৰ�তী ডিবাগিং সম�প�ৰসাৰন সমৰ�থন নকৰে।"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "অংশগ�ৰহণকাৰীক আমন�ত�ৰণ জনাওক"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "কথোপকথনলে আমন�ত�ৰণ জনাবলে �টা পৰিচয় বাছক"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "আমন�ত�ৰণ জনাওক"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "কোনো ডাইলগ প�ৰদৰ�শন নকৰিব; যিকোনো কাম কৰক (উদাহৰনস�বৰূপ, ইমপোৰ�ট কৰা) আৰ� প�ৰস�থান "
 "কৰক"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "কোনো ডাইলগ প�ৰদৰ�শন নকৰিব যেতিয়ালৈকে সিহত \"কাষৰীয়া মান�হ\"�কাওন�টসমূহ নহয়"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "আৰম�ভণিত প�ৰদান কৰা �কাওন�ট (উদাহৰনস�বৰূপ, gabble/jabber/foo_40example_2eorg0) "
 "নিৰ�বাচন কৰক"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy �কাওন�টসমূহ"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy �কাওন�টসমূহ"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "�টা বিশেষ সেৱা দেখ�ৱাওক"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy ডিবাগাৰ"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy ডিবাগাৰ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy চেট ক�লা�ন�ট"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "প�ৰতিক�ৰিয়া"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "নাকচ কৰক"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "উত�তৰ"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "ভিডিঅ'ৰ সৈতে উত�তৰ দিয়ক"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "নাকচ কৰক"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "গ�ৰহন কৰক"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "প�ৰদান কৰক"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s - �ইমাত�ৰ আপোনাক কল কৰাৰ চেষ�টা কৰিছিল, কিন�ত� আপ�নি অন�য �টা কলত আছিল।"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "হল�ডত আছে"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "মিউট"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "অবধি"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "আপোনাৰ বৰ�তমান বেলেঞ�চ হল %s।"
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "ক�ষমা কৰিব, আপোনাৰ সেই কলৰ বাবে পৰ�যাপ�ত দেন নাই।"
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "টপ আপ"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "ফলা মিলাওক (_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "চেটৰ কি ধৰনৰ �কাওন�ট উপস�থিত আছে?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "নত�ন �কাওন�ট যোগ কৰা"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "ওচৰৰ ব�যক�তিৰ"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy -� আপ�নি থকা নেটৱাৰ�কত সংয�ক�ত থকা মান�হবোৰক স�বচালিতভাৱে খোজ কৰি চেট কৰিব "
+"পাৰে। যদি আপ�নি �ই বৈশিষ�ট ব�যৱহাৰ কৰিব বিচাৰে, অন�গ�ৰহ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
+"আছে নে নীৰিক�ষণ কৰক।"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"আপ�নি �ই বিৱৰণসমূহ পিছত সলনি অথবা �ই বৈশিষ�ট অসামৰ�থবান কৰিব পাৰিব পৰিচয় তালিকাত "
+"<span style=\"italic\">সম�পাদন → �কাওন�টসমূহ</span> নিৰ�বাচন কৰি।"
+
+#~ msgid "Call volume"
+#~ msgstr "কল ভলিউম"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "কল ভলিউম, �টা শতাংশ হিচাপে।"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy -� বাটাৰফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy -� বাটাফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে নে।"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "ছ'কেটৰ ধৰন সমৰ�থিত নহয়"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "মোৰ ৱেব �কাওন�টসমূহ"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "�কাওন�ট %s ক %s -ৰে সম�পাদন কৰা হৈছে।"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "�কাওন�ট %s ক Empathy ত সম�পাদন কৰিব নোৱাৰি।"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "মোৰ ৱেব �কাওন�টসমূহ লঞ�চ কৰক"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s সম�পাদনা কৰক"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "বাতিল কৰক (_n)"
+
+#~ msgid "Personal Information"
+#~ msgstr "ব�যক�তিগত তথ�য"
+
+#~ msgid "Ungrouped"
+#~ msgstr "দলীয় নহয়"
+
+#~ msgid "Favorite People"
+#~ msgstr "পছন�দৰ মান�হ"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "সম�পাদনা কৰক (_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "�টা পৰিচয় নিৰ�বাচন কৰক"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "সংয�ক�ত পৰিচয়সমূহ"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
+
+#~ msgid "New contact preview"
+#~ msgstr "নত�ন পৰিচয় পূৰ�বদৰ�শন"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "বাওফালে থকা তালিকাত নিৰ�বাচন কৰা পৰিচয়সমূহ �কেলগে সংয�ক�ত কৰা হব।"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "পৰিচয়সমূহ সংযোগ কৰক (_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "পৰিচয়সমূহ সংয�ক�ত কৰক"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "অসংয�ক�ত কৰক (_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "প�ৰদৰ�শিত সংয�ক�ত পৰিচয়সমূহক পৃথক পৰিচয়সমূহত সম�পূৰ�ণভাৱে বিভাজন কৰক।"
+
+#~ msgid "_Link"
+#~ msgstr "সংয�ক�ত কৰক (_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "সংয�ক�ত পৰিচয়সমূহ '%s' অসংয�ক�ত কৰিব নে?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "আপ�নি নিশ�চিত নে আপ�নি �ই সংয�ক�ত পৰিচয়সমূহ অসংয�ক�ত কৰিব বিচাৰে? ই সংয�ক�ত "
+#~ "পৰিচয়সমূহক সম�পূৰ�ণভাৱে পৃথক পৰিচয়সমূহত বিভাজন কৰিব।"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "অসংয�ক�ত কৰক (_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "পৰিচয়ৰ ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "চেট (_h)"
+
+#~ msgid "Send _Video"
+#~ msgstr "ভিডিঅ' পঠাওক (_V)"
+
+#~ msgid "C_all"
+#~ msgstr "কল (_a)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "আপোনাৰ উপস�থিতি আৰ� বৰ�তমান অৱস�থাৰ তথ�য নিৰ�ধাৰণ কৰক"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "নিৰ�বাচিত পৰিচয়ে নথিপত�ৰসমূহ গ�ৰহণ কৰিব নোৱাৰে।"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "নিৰ�বাচিত পৰিচয় অফলাইন।"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "�কাওন�টসমূহ ইমপোৰ�ট কৰোতে �টা ত�ৰ�টি হৈছিল।"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "�কাওন�ট বিৱৰণসমূহ বিশ�লেষণ কৰোতে �টা ত�ৰ�টি হৈছিল।"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "�কাওন�ট সৃষ�টি কৰোতে �টা ত�ৰ�টি হৈছিল।"
+
+#~ msgid "There was an error."
+#~ msgstr "�টা ত�ৰ�টি হৈছিল।"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "ত�ৰ�টি বাৰ�তা আছিল: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "আপ�নি হয় উভতি যাব পাৰে আৰ� আপোনাৰ �কাওন�ট বিৱৰনসমূহ প�নৰ সোমোৱাৰ চেষ�টা কৰিব "
+#~ "পাৰে অথবা �ই সহায়ক প�ৰস�থান কৰক আৰ� �কাওন�টসমূহ পিছত সম�পাদনা মেন�ৰ পৰা যোগ কৰক।"
+
+#~ msgid "An error occurred"
+#~ msgstr "�টা ত�ৰ�টি দেখা দিছে"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "প�ৰস�ত�ত কৰাৰ উদ�দেশ�যে অন�য কোনো চেটৰ �কাওন�ট উপস�থিত আছে নেকি ?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "আপোনাৰ �কাওন�টৰ বিবৰণ ইয়াত লিখক"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "কি ধৰনৰ চেটৰ �কাওন�ট আপ�নি নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক ?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "চেটৰ অন�য �কাওন�ট নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক নেকি?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "নত�ন �কাওন�টৰ বিৱৰণ লিখক"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy ৰ সৈতে আপ�নি কাষৰীয়া মান�হ আৰ� বন�ধ�সকল আৰ� সহকৰ�মীসকল যোনে Google Talk, "
+#~ "AIM, Windows Live আৰ� অন�য বহতো চেট প�ৰগ�ৰামসমূহ ব�যৱহাৰ কৰে সিহতৰ লগত অনলাইন "
+#~ "চেট কৰিব পাৰিব। �টা মাক�ৰোফোন অথবা �টা ৱেবকেমৰ সৈতে আপ�নি অডিঅ' অথবা ভিডিঅ' "
+#~ "কলসমূহ কৰিব পাৰিব।"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "অন�য কোনো চেটৰ প�ৰোগ�ৰামৰ সৈতে ব�যৱহৃত হৈছে �নে কোনো �কাওন�ট কি বৰ�তমানে উপস�থিত "
+#~ "আছে?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "হয়, চিহ�নিত স�থানৰ পৰা মোৰ �কাওন�টৰ তথ�য ইমপোৰ�ট কৰা হ'ব "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "হয়, মোৰ �কাওন�টৰ তথ�য মই �তিয়ায় লিখিবলৈ ইচ�ছ�ক"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "নহয়, মই নত�ন �কাওন�ট প�ৰাপ�ত কৰিবলৈ ইচ�ছ�ক"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "নহয়, বৰ�তমানে মই অকল ওচৰৰ ব�যক�তিৰ তথ�য চাবলৈ ইচ�ছ�ক"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ইমপোৰ�ট কৰাৰ উদ�দেশ�যে �কাওন�ট নিৰ�বাচন কৰক:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "নহয়, �তিয়াৰ কাৰণে �ইয়াই"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "সম�পাদনা কৰক -> �কাওন�টসমূহ"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "মই �ই বৈশিষ�ট �তিয়ায় সামৰ�থবান কৰিব নিবিচাৰো (_n)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "আপ�নি আপোনাৰ স�থানীয় নেটৱাৰ�কত সংয�ক�ত মান�হবোৰৰ লগত চেট কৰিব নোৱাৰিব কাৰণ, "
+#~ "telepathy-salut ইনস�টল নাই। যদি আপ�নি �ই বৈশিষ�ট সামৰ�থবান কৰিব বিচাৰে, অন�গ�ৰহ "
+#~ "কৰি telepathy-salut পেকেইজ ইনস�টল কৰক আৰ� �কাওন�টসমূহ ডাইলগৰ পৰা �টা কাষৰীয়া "
+#~ "মান�হবোৰ �কাওন�ট সৃষ�টি কৰক"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ সহায়ক"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Empathy লৈ স�বাগতম"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "আপোনাৰ উপস�থিত �কাওন�ট ইমপোৰ�ট কৰক"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "অন�গ�ৰহ কৰি ব�যক�তিগত বিৱৰণসমূহ সোমাওক"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "আপ�নি �টা নত�ন �কাওন�ট সৃষ�টি কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ�তনসমূহ\n"
+#~ "আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
+
+#~ msgid "Protocol:"
+#~ msgstr "প�ৰটোকল:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ�ঞাত"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ�ঞাত"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ�ঞাত"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ�ঞাত"
+
+#~ msgid "_Personal Information"
+#~ msgstr "ব�যক�তিগত তথ�য (_P)"
+
+#~ msgid "Input level:"
+#~ msgstr "ইনপ�ট স�তৰ:"
+
+#~ msgid "Input volume:"
+#~ msgstr "ইনপ�ট ভলিউম:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "নত�ন চেটসমূহ পৃথক উইন�ডোত খোলা হ'ব (_O)"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "বাৰ�তা পঠিয়াওক আৰ� পাওক"
 
@@ -4716,7 +4952,7 @@ msgstr "ফলা মিলাওক (_M)"
 #~ msgstr "পূৰ�ববৰ�তী চেট"
 
 #~ msgid "_For:"
-#~ msgstr "-ৰ কাৰণে: (_F)"
+#~ msgstr "ৰ কাৰণে: (_F)"
 
 #~ msgid "Edit Custom Messages..."
 #~ msgstr "স�বনিৰ�বাচিত বাৰ�তা সম�পাদনা..."
diff --git a/po/be.po b/po/be.po
index ffa1324be..05948757f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,467 +5,478 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 23:43+0300\n"
-"PO-Revision-Date: 2011-12-28 23:44+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-06 15:16+0000\n"
+"PO-Revision-Date: 2012-03-07 23:11+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: be\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Чат у Google Talk, Facebook, MSN ды інш."
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Інт�рн�т-камунікатар"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Інт�рн�т-камунікатар Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Інт�рн�т-камунікатар"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Чат у Google Talk, Facebook, MSN ды інш."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Конты камунікатара і VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Кіраванне контамі камунікатара і VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Заў�ёды адкрываць новае акно дл� новага чату."
+msgid "Connection managers should be used"
+msgstr "Тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Пры�та�аванне від�акамеры"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Ці тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў дл� аўтаматычнага адлуч�нн�/"
+"перазлуч�нн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Разм�шч�нне від�акамеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy му�іць аўтаматычна злучацца пры запу�ку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Знак, �кі тр�ба ў�таўл�ць па�л� м�нушкі пры �е дапаўненні клавішай Тab у "
-"групавым чаце."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ці му�іць Empathy аўтаматычна злучацца з �еткамі пры запу�ку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Матыў акна чату"
+msgid "Empathy should auto-away when idle"
+msgstr ""
+"Empathy му�іць аўтаматычна пераходзіць у р�жым ад�утна�ці пры б�здзейна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "�дмена матыва акна чату"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Спі� моў дл� праверкі арфаграфіі, падзеленых ко�камі (напрыклад, \"en, be, ru"
-"\")."
+"Ці му�іць Empathy аўтаматычна пераходзіць у р�жым ад�утна�ці пры "
+"б�здзейна�ці кары�тальніка."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Прадвызначана� папка дл� �ц�гнутых файлаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Кампактны �пі� кантактаў"
+msgid "The default folder to save file transfers in."
+msgstr "Прадвызначана� папка дл� захаванн� атрыманых файлаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Магічны лік, �кі ўжываецца дл� праверкі, ці тр�ба запу�каць задачы ачы�ткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Крыт�рый �артаванн� �пі�а кантактаў"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c выкары�тоўвае г�ты лік дл� праверкі, ці тр�ба запу�ка�ць задачы ачы�ткі. Кары�тальнікам не варта ўручную зм�н�ць знач�нне г�тага ключа."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Сцежка аб'екта D-Bus, зв�занага з апошнім контам, абраным дл� ўваходу ў "
-"пакой."
+msgid "Show offline contacts"
+msgstr "Паказваць паза�еткавы� кантакты"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Прадвызначанае пры�та�аванне від�акамеры дл� від�аразмоў, напрыклад \"/dev/"
-"video0\"."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ці тр�ба паказваць паза�еткавы� кантакты ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Прадвызначаны каталог дл� выбару аватар"
+msgid "Show avatars"
+msgstr "Паказваць аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "�е паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Ці тр�ба паказваць аватары ў �пі�е кантактаў і вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "�е ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці"
+msgid "Show protocols"
+msgstr "Паказваць інфармацыю аб пратаколе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Паказваць уваходны� падзеі ў абшары �тану"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ці тр�ба паказваць інфармацыю аб пратаколе ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Паказваць уваходны� падзеі ў абшары �тану. Калі выключана, адразу паказваць "
-"іх кары�тальніку."
+msgid "Show Balance in contact list"
+msgstr "Паказваць балан� рахунку у �пі�е кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Падтрымка фільтрацыі р�ха"
+msgid "Whether to show account balances in the contact list."
+msgstr "Ці тр�ба паказваць балан� контаў у �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy можа публікаваць ме�цазнаходжанне кары�тальніка"
+msgid "Compact contact list"
+msgstr "Кампактны �пі� кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ці тр�ба паказваць �пі� кантактаў у кампактным р�жыме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "Hide main window"
+msgstr "Схаваць галоўнае акно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "Hide the main window."
+msgstr "Схаваць галоўнае акно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Прадвызначана� папка дл� �ц�гнутых файлаў"
+msgid "Default directory to select an avatar image from"
+msgstr "Прадвызначаны каталог дл� выбару аватар"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathy му�іць аўтаматычна пераходзіць у р�жым ад�утна�ці пры б�здзейна�ці"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "�пошні каталог, з �кога была выбрана аватара."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy му�іць аўтаматычна злучацца пры запу�ку"
+msgid "Open new chats in separate windows"
+msgstr "�дкрываць новы� чаты ў а�обных вокнах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
+msgid "Always open a separate chat window for new chats."
+msgstr "Заў�ёды адкрываць новае акно дл� новага чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy му�іць выкары�тоўваць аватару кантакта �к значок дл� акна чату"
+msgid "Display incoming events in the status area"
+msgstr "Паказваць уваходны� падзеі ў абшары �тану"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Уключыць прылады ра�працоўшчыка WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Паказваць уваходны� падзеі ў абшары �тану. Калі выключана, адразу паказваць "
+"іх кары�тальніку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� новых паведамленн�ў"
+msgid "The position for the chat window side pane"
+msgstr "Разм�шч�нне бакавога абшару ў акне чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Прав�раць арфаграфію"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Захаванае разм�шч�нне бакавога абшару ў акне чату (у пік�елах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Схаваць галоўнае акно"
+msgid "Show contact groups"
+msgstr "Паказваць групы кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Схаваць галоўнае акно."
+msgid "Whether to show groups in the contact list."
+msgstr "Ці тр�ба паказваць групы ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "�пошні конт, выбраны ў ды�логу ўваходу ў пакой"
+msgid "Contact list sort criterion"
+msgstr "Крыт�рый �артаванн� �пі�а кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Знак па�л� дапоўненай м�нушкі"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Крыт�рый �артаванн� �пі�а кантактаў. Прадвызначаны� паводзіны - �артаваць "
+"паводле �тану кантактаў - уключаюцца знач�ннем \"state\". Знач�нне \"name\" "
+"уключыць �артаванне паводле імёнаў кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "�дкрываць новы� чаты ў а�обных вокнах"
+msgid "Use notification sounds"
+msgstr "�гучваць апав�шч�нні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Сцежка да патр�бнага матыва Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Ці тр�ба агучваць падзеі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Сцежка да патр�бнага матыва Adium, калі дл� чату ўжыты матыў Adium."
+msgid "Disable sounds when away"
+msgstr "�е ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "�гучваць уваходны� паведамленні"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ці тр�ба ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці ці зан�та�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "�гучваць з'�ўленне новых размоў"
+msgid "Play a sound for incoming messages"
+msgstr "�гучваць уваходны� паведамленні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "�гучваць выхадны� паведамленні"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ці тр�ба агучваць уваходны� паведамленні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "�гучваць уваход кантакта ў �етку"
+msgid "Play a sound for outgoing messages"
+msgstr "�гучваць выхадны� паведамленні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "�гучваць выхад кантакта з �еткі"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ці тр�ба агучваць выхадны� паведамленні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "�гучваць злуч�нне з �еткай"
+msgid "Play a sound for new conversations"
+msgstr "�гучваць з'�ўленне новых размоў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "�гучваць адлуч�нне ад �еткі"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ці тр�ба агучваць з'�ўленне новых размоў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ужываць выплыўны� апав�шч�нні, калі чат не мае фоку�у"
+msgid "Play a sound when a contact logs in"
+msgstr "�гучваць уваход кантакта ў �етку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� ўваходу кантакта ў �етку"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ці тр�ба агучваць уваход кантактаў у �етку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� выхаду кантакта з �еткі"
+msgid "Play a sound when a contact logs out"
+msgstr "�гучваць выхад кантакта з �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Разм�шч�нне карцінкі з від�акамеры падча� званка."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ці тр�ба агучваць выхад кантактаў з �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Паказваць балан� рахунку у �пі�е кантактаў"
+msgid "Play a sound when we log in"
+msgstr "�гучваць злуч�нне з �еткай"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Паказваць аватары"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ці тр�ба агучваць злуч�нне з �еткай."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Паказваць �пі� кантактаў у пако�х"
+msgid "Play a sound when we log out"
+msgstr "�гучваць адлуч�нне ад �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Паказваць падказку пры закрыцці галоўнага акна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ці тр�ба агучваць адлуч�нне ад �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Паказваць паза�еткавы� кантакты"
+msgid "Enable popup notifications for new messages"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� новых паведамленн�ў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Паказваць інфармацыю аб пратаколе"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Мовы дл� праверкі арфаграфіі"
+msgid "Disable popup notifications when away"
+msgstr "�е паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Прадвызначана� папка дл� захаванн� атрыманых файлаў."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці ці зан�та�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "�пошні каталог, з �кога была выбрана аватара."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ужываць выплыўны� апав�шч�нні, калі чат не мае фоку�у"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Разм�шч�нне бакавога абшару ў акне чату"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�, "
+"нават калі акно чату ўжо адкрыта, хоць і не мае фоку�у."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Захаванае разм�шч�нне бакавога абшару ў акне чату (у пік�елах)."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� ўваходу кантакта ў �етку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Матыў афармленн� размоў у вокнах чату."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры ўваходзе кантакта ў �етку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "�дмена матыва афармленн� размоў у вокнах чату."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� выхаду кантакта з �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Ужываць графічны� �майлікі"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ці тр�ба паказваць выплыўны� апав�шч�нні пры выхадзе кантакта з �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "�гучваць апав�шч�нні"
+msgid "Use graphical smileys"
+msgstr "Ужываць графічны� �майлікі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Ужываць матыў дл� пако�ў чату"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ці тр�ба пераўтвараць �майлікі ў графічны� вы�вы ў т�к�це размоў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
+msgid "Show contact list in rooms"
+msgstr "Паказваць �пі� кантактаў у пако�х"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ці тр�ба паказваць �пі� кантактаў у пако�х чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
+msgid "Chat window theme"
+msgstr "Матыў акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Матыў афармленн� размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ці му�іць Empathy аўтаматычна злучацца з �еткамі пры запу�ку."
+msgid "Chat window theme variant"
+msgstr "�дмена матыва акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Ці му�іць Empathy аўтаматычна пераходзіць у р�жым ад�утна�ці пры "
-"б�здзейна�ці кары�тальніка."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�дмена матыва афармленн� размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Ці му�іць Empathy пагаршаць дакладна�ць ме�цазнаходжанн� кары�тальніка дзел� "
-"абароны �го права на прыватна�ць."
+msgid "Path of the Adium theme to use"
+msgstr "Сцежка да патр�бнага матыва Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ці му�іць Empathy выкары�тоўваць аватару кантакта �к значок акна чату."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Сцежка да патр�бнага матыва Adium, калі дл� чату ўжыты матыў Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Ці тр�ба ўключыць прылады ра�працоўшчыка WebKit (напрыклад, Web Inspector)."
+msgid "Enable WebKit Developer Tools"
+msgstr "Уключыць прылады ра�працоўшчыка WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Ці тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў дл� аўтаматычнага адлуч�нн�/"
-"перазлуч�нн�."
+"Ці тр�ба ўключыць прылады ра�працоўшчыка WebKit (напрыклад, Web Inspector)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Inform other users when you are typing to them"
 msgstr ""
-"Ці тр�ба прав�раць арфаграфію напі�аных �лоў па �пі�е магчымых моў т�к�ту."
+"Паведамл�ць іншым кары�тальнікам аб тым, што вы пішаце дл� іх паведамленне"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ці тр�ба пераўтвараць �майлікі ў графічны� вы�вы ў т�к�це размоў."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Ці тр�ба па�ылаць апав�шч�нні аб �тане чату тыпу \"пішу\" ці \"пера�таў "
+"пі�аць\". Пакуль што не ўплывае на �тан ад�утна�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Ці тр�ба ўключыць фільтрацыю р�ха Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Ужываць матыў дл� пако�ў чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ці тр�ба агучваць уваход кантактаў у �етку."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ці тр�ба ўжываць г�ты матыў дл� пако�ў чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ці тр�ба агучваць выхад кантактаў з �еткі."
+msgid "Spell checking languages"
+msgstr "Мовы дл� праверкі арфаграфіі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Ці тр�ба агучваць падзеі."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спі� моў дл� праверкі арфаграфіі, падзеленых ко�камі (напрыклад, \"en, be, ru"
+"\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ці тр�ба агучваць уваходны� паведамленні."
+msgid "Enable spell checker"
+msgstr "Прав�раць арфаграфію"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ці тр�ба агучваць з'�ўленне новых размоў."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Ці тр�ба прав�раць арфаграфію напі�аных �лоў па �пі�е магчымых моў т�к�ту."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ці тр�ба агучваць выхадны� паведамленні."
+msgid "Nick completed character"
+msgstr "Знак па�л� дапоўненай м�нушкі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ці тр�ба агучваць злуч�нне з �еткай."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак, �кі тр�ба ў�таўл�ць па�л� м�нушкі пры �е дапаўненні клавішай Тab у "
+"групавым чаце."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ці тр�ба агучваць адлуч�нне ад �еткі."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy му�іць выкары�тоўваць аватару кантакта �к значок дл� акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ці тр�ба ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці ці зан�та�ці."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Ці му�іць Empathy выкары�тоўваць аватару кантакта �к значок акна чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ці тр�ба паказваць выплыўны� апав�шч�нні пры выхадзе кантакта з �еткі."
+msgid "Last account selected in Join Room dialog"
+msgstr "�пошні конт, выбраны ў ды�логу ўваходу ў пакой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры ўваходзе кантакта ў �етку."
+"Сцежка аб'екта D-Bus, зв�занага з апошнім контам, абраным дл� ўваходу ў "
+"пакой."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�, "
-"нават калі акно чату ўжо адкрыта, хоць і не мае фоку�у."
+msgid "Camera device"
+msgstr "Пры�та�аванне від�акамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�."
+"Прадвызначанае пры�та�аванне від�акамеры дл� від�аразмоў, напрыклад \"/dev/"
+"video0\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Ці тр�ба паказваць балан� контаў у �пі�е кантактаў."
+msgid "Camera position"
+msgstr "Разм�шч�нне від�акамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Ці тр�ба паказваць аватары ў �пі�е кантактаў і вокнах чату."
+msgid "Position the camera preview should be during a call."
+msgstr "Разм�шч�нне карцінкі з від�акамеры падча� званка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Ці тр�ба паказваць паза�еткавы� кантакты ў �пі�е кантактаў."
+msgid "Echo cancellation support"
+msgstr "Падтрымка фільтрацыі р�ха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці ці зан�та�ці."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ці тр�ба ўключыць фільтрацыю р�ха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ці тр�ба паказваць інфармацыю аб пратаколе ў �пі�е кантактаў."
+msgid "Show hint about closing the main window"
+msgstr "Паказваць падказку пры закрыцці галоўнага акна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ці тр�ба паказваць �пі� кантактаў у пако�х чату."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Ці тр�ба паказваць �пі� кантактаў у кампактным р�жыме."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -473,29 +484,51 @@ msgstr ""
 "Ці тр�ба паказваць ды�логавае акенца пры закрыцці галоўнага акна з дапамогай "
 "кнопкі \"x\" у загалоўнай �тужцы."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy можа публікаваць ме�цазнаходжанне кары�тальніка"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ці тр�ба ўжываць г�ты матыў дл� пако�ў чату."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
-"Крыт�рый �артаванн� �пі�а кантактаў. Прадвызначаны� паводзіны - �артаваць "
-"паводле імёнаў кантактаў - уключаюцца знач�ннем \"name\". Знач�нне \"state\" "
-"уключыць �артаванне паводле �тану кантактаў."
+"Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Кіраванне контамі камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Конты камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ці му�іць Empathy пагаршаць дакладна�ць ме�цазнаходжанн� кары�тальніка дзел� "
+"абароны �го права на прыватна�ць."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -521,7 +554,7 @@ msgstr "Памылка пры �пробе перадачы файла"
 msgid "The other participant is unable to transfer the file"
 msgstr "Суразмоўца не здолеў ажыцц�віць перадачу файла"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�ев�дома� прычына"
 
@@ -541,7 +574,7 @@ msgstr "Выбраны файл не з'�ўл�ецца звычайным фа
 msgid "The selected file is empty"
 msgstr "Выбраны файл пу�ты"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Прапушчаны званок ад %s"
@@ -557,137 +590,137 @@ msgstr "Званок да %s"
 msgid "Call from %s"
 msgstr "Званок ад %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Да�тупны"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зан�ты"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "�д�утны"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "��бачны"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Па-за �еткай"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�ев�дома"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Прычына не азначана"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Уключаны р�жым па-за �еткай"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Сеткава� памылка"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "��ўдала� ід�нтыфікацы�"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Памылка шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ім� ўжо зан�та"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертыфікат не пададзены"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертыфікат не за�лугоўвае даверу"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертыфікат �а�тар�ў"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертыфікат не актывізаваны"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�азва камп'ютара ў �ертыфікаце не адпав�дае патр�бнай"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�дбітак �ертыфіката не адпав�дае патр�бнаму"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертыфікат ула�наручна падпі�аны"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Памылка �ертыфіката"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шыфраванне неда�тупнае"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Хібны �ертыфікат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "�дмоўлена ў злуч�нні"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е ўдало�� ў�тал�ваць злуч�нне"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Злуч�нне �трачана"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Г�ты р��ур� ужо злучаны з �ерверам"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Г�ты конт ужо злучаны з �ерверам"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Злуч�нне заменена новым дл� таго ж �амага р��ур�у"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Такі конт ужо і�нуе на �ерверы"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер надта зан�ты і не можа аб�лужыць г�та злуч�нне"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертыфікат быў адкліканы"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Дл� �ертыфіката выкары�таны �лабы або неб��печны алгарытм шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -695,27 +728,31 @@ msgstr ""
 "Даўжын� �ертыфіката �ервера або глыбін� �го ланцуга перавышае абмежаванне, "
 "вы�таўленае крыптаграфічнай біблі�т�кай"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Ваша апраграмаванне надта �тарое"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутрана� памылка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Людзі паблізу"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Японі�"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -723,7 +760,7 @@ msgstr[0] "%d �екунда таму"
 msgstr[1] "%d �екунды таму"
 msgstr[2] "%d �екунд таму"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -731,7 +768,7 @@ msgstr[0] "%d хвіліна таму"
 msgstr[1] "%d хвіліны таму"
 msgstr[2] "%d хвілін таму"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -739,7 +776,7 @@ msgstr[0] "%d гадзіна таму"
 msgstr[1] "%d гадзіны таму"
 msgstr[2] "%d гадзін таму"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -747,7 +784,7 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -755,7 +792,7 @@ msgstr[0] "%d тыдзень таму"
 msgstr[1] "%d тыдні таму"
 msgstr[2] "%d тыдн�ў таму"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -763,16 +800,16 @@ msgstr[0] "%d ме��ц таму"
 msgstr[1] "%d ме��цы таму"
 msgstr[2] "%d ме��цаў таму"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "у будучыні"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "У�е конты"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Конт"
 
@@ -790,30 +827,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Ім� кары�тальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "У_жыць"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Увай�ці"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Такі конт ужо і�нуе на г�тым �ерверы"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Стварыць новы конт на г�тым �ерверы"
 
@@ -822,137 +859,137 @@ msgstr "Стварыць новы конт на г�тым �ерверы"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Конт %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�овы конт"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Прыклад:</b> МаёКантактнаеІм�"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "�дмы�ловае"
+msgid "Screen _Name:"
+msgstr "_Кантактнае ім�:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Прыклад:</b> МаёКантактнаеІм�"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомніць пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомніць пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Кантактнае ім�:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Ваш пароль да конта AIM"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "�дмы�ловае"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Ваша кантактнае ім� дл� конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Ваш пароль да конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Прыклад:</b> ім�_кары�тальніка"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Ід_�нтыфікатар конта:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Прыклад:</b> ім�_кары�тальніка"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Ваш ід�нтыфікатар кары�тальніка да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Ваш пароль да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ-ід_�нтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Прыклад:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ-ід_�нтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Ваш ід�нтыфікатар да конта ICQ"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Ваш пароль да конта ICQ"
 
@@ -989,11 +1026,23 @@ msgstr "Options"
 msgid "None"
 msgstr "�ічога"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сетка"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Сетка:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Серверы"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1001,14 +1050,6 @@ msgstr ""
 "Больша�ць IRC-�ервераў не патрабуе парол�ў, таму калі вы не ўп�ўнены, про�та "
 "пакіньце графу парол� пу�той."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сетка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сетка:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "М�нушка:"
@@ -1025,48 +1066,20 @@ msgstr "Развітальнае паведамленне:"
 msgid "Real name:"
 msgstr "Сапраўднае ім�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Ваша м�нушка ў IRC-�етцы"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "IRC-�етка"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Прыклад:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Прыклад:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_�бав�зковае шыфраванне (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "І_гнараваць памылкі SSL-�ертыфіката"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "За�ланіць на�тройкі �ервера ўла�нымі"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Пры�рыт�т:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Ваша м�нушка ў IRC-�етцы"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Р��ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Ваша ім� кары�тальніка ў �етцы Facebook"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1079,179 +1092,203 @@ msgstr ""
 "Каб выбраць �абе ім�, наведайце <a href=\"http://www.facebook.com/username/"
 "\">г�ту �таронку</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "_Выкары�тоўваць �тары SSL-пратакол"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Ваш пароль да конта Facebook"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Ваша ім� кары�тальніка ў �етцы Facebook"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Ваш ід�нтыфікатар Google"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Прыклад:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Ваш пароль да конта Google"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Прыклад:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "І_гнараваць памылкі SSL-�ертыфіката"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Пры�рыт�т:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Р��ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_�бав�зковае шыфраванне (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "_Выкары�тоўваць �тары SSL-пратакол"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "За�ланіць на�тройкі �ервера ўла�нымі"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Ваш ід�нтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Ваш пароль да конта Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Пажаданы ід�нтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Ваш пароль да конта Jabber"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Ваш пароль да пажаданага конта Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Прыклад:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Ваш ід�нтыфікатар Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Ваш пароль да конта Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_Электронны паштовы адра�:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_М�нушка:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Прозвішча:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "Ім_�:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_�публікаванае ім�:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber-ід_�нтыфікатар:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Прозвішча:"
+msgid "E-_mail address:"
+msgstr "_Электронны паштовы адра�:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_�публікаванае ім�:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Ім� _кары�тальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Прыклад:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Ім� дл� ід�нтыфікацыі кары�тальніка:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Пошук �ув�зі"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�ўтаматычны пошук STUN-�ервера"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Выкары�тоўваць г�ты конт дл� званкоў на _хатні� і мабільны� т�лефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ігнараваць памылкі TLS-пратакола"
+msgid "NAT Traversal Options"
+msgstr "Опцыі праходу праз NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Прамежак ча�у (у �екундах)"
+msgid "Proxy Options"
+msgstr "Опцыі прок�і-�ервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опцыі падтрымкі �ув�зі"
+msgid "Miscellaneous Options"
+msgstr "Разна�тайны� опцыі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Вольна� маршрутызацы�"
+msgid "STUN Server:"
+msgstr "STUN-�ервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механізм:"
+msgid "Discover the STUN server automatically"
+msgstr "�ўтаматычны пошук STUN-�ервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разна�тайны� опцыі"
+msgid "Discover Binding"
+msgstr "Пошук �ув�зі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опцыі праходу праз NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опцыі падтрымкі �ув�зі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механізм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опцыі прок�і-�ервера"
+msgid "Interval (seconds)"
+msgstr "Прамежак ча�у (у �екундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Ім� дл� ід�нтыфікацыі кары�тальніка:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�парт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-�ервер:"
+msgid "Loose Routing"
+msgstr "Вольна� маршрутызацы�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Ігнараваць памылкі TLS-пратакола"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�парт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Выкары�тоўваць г�ты конт дл� званкоў на _хатні� і мабільны� т�лефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Ваш пароль да конта SIP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Ваш ід�нтыфікатар да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Ім� _кары�тальніка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Ваш пароль да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-ід_�нтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "І_гнараваць запраш�нні на канфер�нцыі і ў пакоі чату"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Ваш ід�нтыфікатар да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Ваш пароль да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-ід_�нтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1289,65 +1326,65 @@ msgstr "У�е файлы"
 msgid "Click to enlarge"
 msgstr "П�трыкніце, каб пав�лічыць"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Узнікла памылка пры званку"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Г�ты кантакт не падтрымлівае званкоў"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Г�ты кантакт па-за �еткай"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Г�ты кантакт хібны"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Г�ты пратакол не падтрымлівае �к�транны� званкі"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Вам не �тае грошай, каб перанакіраваць г�ты званок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�е ўдало�� ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Г�та� размова не падтрымлівае т�мы"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не маеце дазволу на зм�ненне т�мы размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" не з'�ўл�ецца прыдатным ід�нтыфікатарам кантакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ачы�ціць у�е паведамленні ў адкрытым акне размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <т�ма>: прызначыць т�му дл� актыўнай размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1355,24 +1392,24 @@ msgstr ""
 "/part [<ід�нтыфікатар пако�>] [<прычына>]: пакінуць групавы чат, звычайна "
 "актыўны"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <кантакт> [<паведамленне>]: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <кантакт> <паведамленне>: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <м�нушка>: зм�ніць �ваю м�нушку на актыўным �ерверы"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <паведамленне>: па�лаць ACTION-паведамленне ў адкрытае акно размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1383,11 +1420,11 @@ msgstr ""
 "\". �апрыклад: \"/say /join выкары�тоўваецца дл� далуч�нн� да новага "
 "групавога чату ў пакоі\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1395,122 +1432,128 @@ msgstr ""
 "/help [<загад>]: паказаць у�е в�домы� загады. Калі пададзены <загад>, "
 "паказаць правілы �го выкары�танн�."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Правілы кары�танн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�ев�домы загад"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�ев�домы загад. Каб пагл�дзець �пі� у�іх в�домых загадаў, выканайце /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "не �тае грошай дл� па�ылкі паведамленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка па�ылкі паведамленн� \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Памылка па�ылкі паведамленн�: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "не �тае грошай дл� па�ылкі паведамленн�. <a href='%s'>Папоўніце рахунак</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не падтрымліваецца"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "па-за �еткай"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "хібны кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "адмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "надта доўгае паведамленне"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "не р�алізавана"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "нев�дома"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Т�ма:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Т�ма вызначана �к: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Т�ма вызначана кантактам %s �к: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Т�ма не вызначана"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(н�ма прапаноў)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "У�тавіць �майлік"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Па�лаць"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Прапанаваны� _вары�нты выпраўленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�е ўдало�� атрымаць �вежы� журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "Удзельнік %s ц�пер па-за �еткай"
@@ -1518,12 +1561,12 @@ msgstr "Удзельнік %s ц�пер па-за �еткай"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "Удзельніка %s выпхнулі з пако�"
@@ -1531,17 +1574,17 @@ msgstr "Удзельніка %s выпхнулі з пако�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Удзельнік %2$s забаніў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "Удзельніка %s забанілі"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "Удзельнік %s пакінуў пакой"
@@ -1551,17 +1594,17 @@ msgstr "Удзельнік %s пакінуў пакой"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "Удзельнік %s увайшоў у пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Удзельнік %s ц�пер называецца %s"
@@ -1569,55 +1612,55 @@ msgstr "Удзельнік %s ц�пер называецца %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "�длучаны"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ці вы хочаце захаваць г�ты пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомніць"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Паўтарыць"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Хібны пароль. Паўтарыце �пробу:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Г�ты пакой абаронены паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Далучыцца"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Размова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1649,10 +1692,10 @@ msgstr "РÑ�дагаванне Ñ�піÑ�а блакіраваных кантакÑ
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Конт:"
 
@@ -1662,7 +1705,7 @@ msgstr "Блакіраваны� кантакты"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Выдаліць"
@@ -1685,34 +1728,30 @@ msgstr "_�дкрыць �па�ылку"
 msgid "%A %B %d %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "��абі�ты� зве�ткі"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�овы кантакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блакіраваць %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ці вы �апраўды хочаце блакіраваць \"%s\" у магчыма�ці кантактаванн� з вамі?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блакіраваць"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1721,17 +1760,17 @@ msgstr[1] "_Па�кардзіцца на г�ты� кантакты"
 msgstr[2] "_Па�кардзіцца на г�ты� кантакты"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Вырашыць пазней"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запыт на падпі�ку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блакіраваць кары�тальніка"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Вырашыць пазней"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1886,7 +1925,7 @@ msgstr "Вышын�:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�цазнаходжанне"
 
@@ -1912,6 +1951,16 @@ msgstr "Захаваць аватару"
 msgid "Unable to save avatar"
 msgstr "�е ўдало�� захаваць аватару"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "��абі�ты� падраб�зна�ці"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Падраб�зна�ці аб кантакце"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Поўнае ім�"
@@ -1977,54 +2026,49 @@ msgstr "дл� пошты"
 msgid "parcel"
 msgstr "дл� па�ылак"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ме�цазнаходжанне</b> (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Ід�нтыфікатар:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�еўданім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Зве�ткі аб кліенце"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Кліент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ме�цазнаходжанне</b> (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Падраб�зна�ці аб кантакце"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Вы�ланы запыт зве�так..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Ід�нтыфікатар:"
+msgid "Client Information"
+msgstr "Зве�ткі аб кліенце"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Вы�ланы запыт зве�так..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "�С:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�і�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Кліент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2032,17 +2076,17 @@ msgstr ""
 "Вызначыце групы дл� г�тага кантакта. Заўважце, што можна не выбіраць ні "
 "адной групы або выбраць адразу некалькі."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Дадаць групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбар"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
@@ -2064,156 +2108,141 @@ msgstr[2] "Ð�аÑ�тупныÑ� ідÑ�нтычнаÑ�ці не могуць быцÑ
 msgid "Edit Contact Information"
 msgstr "Р�дагаванне кантактных зве�так"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Зв�заны� кантакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Вызначыце кантакты дл� �ув�зі"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Пап�р�дні агл�д новага кантакта"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Кантакты, вылучаны� ў левым �пі�е, будуць аб'�днаны� ў адно."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберыце конт дл� перанакіраванн� званка"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мабільны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Працоўны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Хатні т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Блакіраваць кантакт"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Чат"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "П_а�лаць SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Пап�р�дні� размовы"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Па�лаць файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Падз�ліцца до�тупам да �тала"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Упадабаны"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не ў�тал�ваны"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"У�талюйце gnome-contacts, каб атрымаць до�туп да падраб�зна�ц�ў кантактаў."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_Зве�ткі"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Р�дагаваць"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_�б'�днаць кантакты..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Запрашаю ва� у г�ты пакой"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Запра�іць у пакой групавога чату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Дадаць кантакт..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Выдаліць і _блакіраваць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць групу \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Выдаленне групы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Выдаліць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць кантакт \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2222,7 +2251,7 @@ msgstr ""
 "Ці вы �апраўды хочаце выдаліць аб'�днальны кантакт \"%s\"? Г�та аперацы� "
 "так�ама выдаліць �го �кладовы� кантакты."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Выдаленне кантакта"
 
@@ -2238,23 +2267,23 @@ msgstr[2] "�б'�днальны кантакт дл� %u кантактаў"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ме�цазнаходжанне</b> (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "У �етцы, з т�лефона або мабільнага пры�та�аванн�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова� �етка"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберыце IRC-�етку"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_�нул�ваць змены ў �пі�е �етак"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбраць"
@@ -2267,91 +2296,48 @@ msgstr "новы �ервер"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "�б'�днанне кантактаў"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Раз'�днаць..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Цалкам раздз�ліць аб'�днаны� кантакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_�б'�днаць"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Раз'�днаць аб'�днаны� кантакты \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ці вы �апраўды хочаце раз'�днаць аб'�днаны� кантакты? Г�та прыв�дзе да іх "
-"поўнага падзелу."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Раз'�днаць"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Журнал"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Паказаць"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Чат у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Чат з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2359,7 +2345,7 @@ msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунды"
 msgstr[2] "%s �екунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2367,120 +2353,120 @@ msgstr[0] "%s хвіліна"
 msgstr[1] "%s хвіліны"
 msgstr[2] "%s хвілін"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Званок прац�гваў�� %s, �кончаны ў %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сённ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Учора"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "За ўве�ь ча�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "У�е"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Калі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "У�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Т�к�тавы� чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Уваходны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Выхадны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Прапушчаны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Што"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ці вы �апраўды хочаце выдаліць у�е журналы мінулых размоў?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "�чы�ціць у�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Выдаліць дл�:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка...</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Чат"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Праўка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Выдаліць у�е журналы размоў..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Від�а"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Чат"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Праўка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Від�а"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�таронка 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Г�ты кантакт па-за �еткай"
@@ -2527,7 +2513,7 @@ msgid "There was an error starting the conversation"
 msgstr "Узнікла памылка пры пачатку размовы"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Упішыце ід�нтыфікатар кантакту або т�лефонны нумар:"
 
@@ -2537,17 +2523,17 @@ msgid "New Conversation"
 msgstr "�ова� размова"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "�овы званок"
 
@@ -2603,7 +2589,7 @@ msgstr "Ула�ны� паведамленні..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "�овы конт %s"
@@ -2613,20 +2599,20 @@ msgid "Find:"
 msgstr "Шукаць:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Улічваць р�гі�тр літар"
+msgid "_Previous"
+msgstr "�а_зад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Выраз не знойдзены"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_�аперад"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Улічваць р�гі�тр літар"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "�а_зад"
+msgid "Phrase not found"
+msgstr "Выраз не знойдзены"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2672,12 +2658,12 @@ msgstr "Гала�авы званок �кончаны"
 msgid "Edit Custom Messages"
 msgstr "Р�дагаванне ўла�ных паведамленн�ў"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Паведамленне зменена ў %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Звычайны"
 
@@ -2754,34 +2740,38 @@ msgid "Certificate hostname: %s"
 msgstr "�азва камп'ютара з �ертыфіката: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Прац�гнуць"
+msgid "C_ontinue"
+msgstr "_Прац�гнуць"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�е вартае даверу злуч�нне"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Г�та злуч�нне не вартае даверу. У�ё роўна прац�гнуць прац�дуру?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомніць г�ты выбар дл� на�тупных злуч�нн�ў"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Падраб�зна�ці аб �ертыфікаце"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "�е ўдало�� адкрыць URI-адра�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выбар файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�е �тае вольнай пра�торы дл� захаванн� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2790,7 +2780,7 @@ msgstr ""
 "Каб захаваць г�ты файл, патр�бна %s вольнай пра�торы, а да�тупна толькі %s. "
 "Выберыце іншае ме�ца дл� файла."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Уваходны файл ад %s"
@@ -2970,23 +2960,23 @@ msgstr "��ма паведамленн� аб памылцы"
 msgid "Instant Message (Empathy)"
 msgstr "Імгненнае паведамленне (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "�е злучацца пры запу�ку"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е паказваць �пі� кантактаў ды іншы� акенцы пры запу�ку"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Інт�рн�т-камунікатар Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Памылка �ув�зі з кіраўніком контаў"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3041,233 +3031,83 @@ msgstr ""
 "insomnia <defragbrain@gmail.com>\n"
 "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Падча� імпартаванн� контаў узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Падча� разбору падраб�зна�ц�ў аб конце ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Падча� �твар�нн� конта ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "�пі�анне памылкі: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Вы можаце альбо в�рнуцца назад і паўтарыць увод падраб�зна�ц�ў аб вашых "
-"контах, альбо закрыць г�тага памочніка і дадаць конты пазней з дапамогай "
-"меню Праўка."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Узнікла памылка"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Тып вашага конта дл� чату"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ці вы маеце іншы� конты дл� чату, �кі� б вы так�ама хацелі на�троіць?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Падайце падраб�зны� зве�ткі аб вашым конце"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Тып новага конта дл� чату"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Ці тр�ба �тварыць іншы� конты дл� чату?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Падайце падраб�зны� зве�ткі аб новым конце"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"З дапамогай Empathy вы можаце гутарыць з іншымі людзьмі паблізу, а так�ама з "
-"��брамі і калегамі, �кі� кары�таюцца Google Talk, AIM, Windows Live і іншымі "
-"праграмамі дл� чату. Калі вы маеце мікрафон ці �еціўную від�акамеру, так�ама "
-"можна рабіць аўды�- і від�азванкі."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ці вы маеце конт, �кім ужо кары�талі�� ў іншай праграме дл� чату?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Так, тр�ба імпартаваць на�тройкі конта з "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Так, � падам на�тройкі конта"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "�е, мне патр�бны новы конт"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, пакуль што � толькі хачу ўбачыць людзей паблізу м�не"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Вызначыце конты дл� імпартаванн�:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Так"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "�е, пакуль што ў�ё"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, �кі� "
-"кары�таюцца вашай �еткай. Калі вы хочаце выкары�таць г�ту магчыма�ць, "
-"праверце правільна�ць на�троек, змешчаных ніж�й. Пазней можна будзе зм�ніць "
-"г�ты� на�тройкі або наогул выключыць г�ту функцыю ў ды�логавым акенцы \"Конты"
-"\"."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Праўка->Конты"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Пакуль не _тр�ба ўключаць г�ту функцыю"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Вы не зможаце браць удзел у чатах з людзьмі, �кі� кары�таюцца вашай �еткай, "
-"бо telepathy-salut не ў�тал�ваны. Калі вы хочаце ўключыць г�ту функцыю, "
-"у�талюйце пакунак \"telepathy-salut\" і �тварыце конт \"Людзі паблізу\" у "
-"акенцы \"Конты\"."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut не ў�тал�ваны"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Памочнік на�тройкі контаў дл� чату і VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Вітаем у Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Імпартаванне на�ўных контаў"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Запоўніце анкету з а�абі�тымі зве�ткамі"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Ваш конт %s мае незахаваны� змены."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваш новы конт �шч� не захаваны."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Злуч�нне..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Па-за �еткай - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "�длучаны - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Па-за �еткай - ��ма �еткавага злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "�ев�домы �тан"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Г�ты конт быў выключаны, бо ён выкары�тоўвае �а�тар�лы праграмны драйвер, "
+"�кі ўжо не падтрымліваецца. Каб перане�ці г�ты конт у новую вер�ію праграмы, "
+"у�талюйце пакунак telepathy-haze і перазапу�ціце �еан�."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Па-за �еткай - Конт выключаны"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Зм�ненне параметраў злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "�е ўдало�� атрымаць а�абі�ты� зве�ткі з �ервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Злучыце�� з �еткай, каб змагчы р�дагаваць а�абі�ты� зве�ткі."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Зм�ніць параметры злуч�нн�..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ці вы �апраўды хочаце выдаліць %s �а �вайго камп'ютара?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Г�тае дзе�нне не выдаліць ваш конт на �ерверы."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3276,15 +3116,23 @@ msgstr ""
 "вашых змен. Ці вы �апраўды хочаце прац�гнуць прац�дуру?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Выключыць"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Прапу�ціць"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Злучыць"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3296,19 +3144,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Дадаць..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Загрузка зве�так аб конце"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
+msgid "_Import…"
+msgstr "І_мпартаваць..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Пратакол:"
+msgid "Loading account information"
+msgstr "Загрузка зве�так аб конце"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3316,27 +3160,23 @@ msgstr ""
 "Каб дадаць новы конт, �пачатку тр�ба ў�тал�ваць модуль падтрымкі адпаведнага "
 "пратакола."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "І_мпартаваць..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- ід�нтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Ід�нтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Людзі паблізу"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- �ўды�- і від�акліент Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "�ўды�- і від�акліент Empathy"
 
@@ -3362,15 +3202,15 @@ msgstr "_Бакава� паліца"
 
 #: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
-msgstr "�ўды�ўваход"
+msgstr "�ўды�ўвод"
 
 #: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
-msgstr "Від�аўваход"
+msgstr "Від�аўвод"
 
 #: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
-msgstr "Пан�ль набору нумару"
+msgstr "Пан�ль набору"
 
 #: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
@@ -3379,57 +3219,57 @@ msgstr "Падраб�зна�ці"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Званок: %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-адра�, �кі бачыць машына"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адра�, �кі бачыць �ервер у інт�рн�це"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адра� �уразмоўцы, бачны з іншага боку злуч�нн�"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-адра� р�тран�л�тарнага �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP-адра� мультыка�т-групы"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "�ев�домы"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr "Прац�гла�ць злуч�нн� - %d:%02d хв"
+msgstr "Злуч�нне: %d:%02d хв"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Т�хнічны� падраб�зна�ці"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3438,8 +3278,8 @@ msgstr ""
 "�праграмаванне, �кім кары�таецца %s, не разумее ні аднаго з аўды�фарматаў, "
 "�кі� падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3448,8 +3288,8 @@ msgstr ""
 "�праграмаванне, �кім кары�таецца %s, не разумее ні аднаго з від�афарматаў, "
 "�кі� падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3458,29 +3298,29 @@ msgstr ""
 "�е ўдало�� ў�тал�ваць злуч�нне з %s. Відаць, хто�ьці з ва� далучаны да "
 "�еткі, �ка� не дазвал�е непа�р�днае злуч�нне."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "У �етцы ўзнікла памылка"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�праграмаванне дл� аўды�фарматаў, патр�бных дл� аб�лугоўванн� г�тага званка, "
 "не ў�тал�вана на г�тым камп'ютары"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "�праграмаванне дл� від�афарматаў, патр�бных дл� аб�лугоўванн� г�тага званка, "
 "не ў�тал�вана на г�тым камп'ютары"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3491,161 +3331,213 @@ msgstr ""
 "\">паведаміце аб г�тай хібе ў праграме</a> і прычапіце журнальны вывад з "
 "акенца \"�дладка\" ў меню \"Дапамога\"."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "У рухавіку званкоў узнікла памылка"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Да��гнуты канец �трумен�"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�е ўдало�� ра�пачаць аўды��трумен�ванне"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�е ўдало�� ра�пачаць від�а�трумен�ванне"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�ўды�"
+msgid "_Call"
+msgstr "_Званок"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Д�кадавальны код�к:"
+msgid "_Microphone"
+msgstr "_Мікрафон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Выключыць від�акамеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Паказаць пан�ль набору"
+msgid "_Settings"
+msgstr "_�а�тройкі"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кадавальны код�к:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Від"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Паве�іць трубку"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Дапамога"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Закончыць г�ту размову"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Зме�т"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "М��цовы кандыдат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "�д_ладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Разгарнуць м�не"
+msgid "Swap camera"
+msgstr "Пам�н�ць камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Згарнуць м�не"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "�ддалены кандыдат:"
+msgid "Maximise me"
+msgstr "Разгарнуць м�не"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Па�ылаць аўды��ігнал"
+msgid "Disable camera"
+msgstr "Выключыць від�акамеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Па�ылаць від�а�ігнал"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Паве�іць трубку"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Паказаць пан�ль набору"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Закончыць г�ту размову"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Від�азванок"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Ра�пачаць від�азванок"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Ра�пачаць аўды�званок"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Пам�н�ць камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Пераключыць перадачу аўды��ігналу"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Пераключыць перадачу від�а�ігналу"
+msgid "Show dialpad"
+msgstr "Паказаць пан�ль набору"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "�ев�дома"
+msgid "Display the dialpad"
+msgstr "Паказаць пан�ль набору"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Па�ылаць від�а�ігнал"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Від�азванок"
+msgid "Toggle video transmission"
+msgstr "Пераключыць перадачу від�а�ігналу"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Званок"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Па�ылаць аўды��ігнал"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Зме�т"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Пераключыць перадачу аўды��ігналу"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "�д_ладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кадавальны код�к:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Дапамога"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "�ев�дома"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Д�кадавальны код�к:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Мікрафон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "�ддалены кандыдат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_�а�тройкі"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "М��цовы кандыдат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Від"
+msgid "Audio"
+msgstr "�ўды�"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрыць г�та акно?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Закрыўшы г�та акно, вы выйдзеце з %s. Вы больш не будзеце атрымліваць новых "
+"паведамленн�ў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+msgstr[1] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�ў. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+msgstr[2] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�ў. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Вый�ці з %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Вы больш не будзеце атрымліваць новых паведамленн�ў з г�тага пако� да "
+"паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрыць акно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Вый�ці з пако�"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3653,7 +3545,7 @@ msgstr[0] "%s (%d непрачытана)"
 msgstr[1] "%s (%d непрачытана)"
 msgstr[2] "%s (%d непрачытана)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3661,7 +3553,7 @@ msgstr[0] "%s (і �шч� %u размова)"
 msgstr[1] "%s (і �шч� %u размовы)"
 msgstr[2] "%s (і �шч� %u размоў)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3669,7 +3561,7 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад іншÑ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад іншых)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад іншых)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3677,11 +3569,11 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад уÑ�Ñ–Ñ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад у�іх)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад у�іх)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3689,69 +3581,69 @@ msgstr[0] "Па�ылка %d паведамленн�"
 msgstr[1] "Па�ылка %d паведамленн�ў"
 msgstr[2] "Па�ылка %d паведамленн�ў"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Піша паведамленне."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_�чы�ціць"
+msgid "_Conversation"
+msgstr "_Размова"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Кантакт"
+msgid "C_lear"
+msgstr "_�чы�ціць"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "_У�тавіць �майлік"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Упадабаны пакой дл� групавога чату"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "_Запра�іць удзельнікаў..."
+msgid "Notify for All Messages"
+msgstr "�пав�шчаць аб у�іх паведамленн�х"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Па�унуць картку ў_лева"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Паказаць �пі� кантактаў"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Па�унуць картку ў_права"
+msgid "Invite _Participant…"
+msgstr "_Запра�іць удзельнікаў..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "�пав�шчаць аб у�іх паведамленн�х"
+msgid "C_ontact"
+msgstr "_Кантакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Размова"
+msgid "_Tabs"
+msgstr "_Карткі"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_�дчапіць картку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Упадабаны пакой дл� групавога чату"
+msgid "_Previous Tab"
+msgstr "Да _пап�р�дн�й карткі"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Да _на�тупнай карткі"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Да _пап�р�дн�й карткі"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_В�рнуць закрытую картку"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Паказаць �пі� кантактаў"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Па�унуць картку ў_лева"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Карткі"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Па�унуць картку ў_права"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_В�рнуць закрытую картку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_�дчапіць картку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3765,100 +3657,100 @@ msgstr "Пакой"
 msgid "Auto-Connect"
 msgstr "�ўтаматычнае злуч�нне"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Кіраванне �пі�ам упадабаных пако�ў дл� групавога чату"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Уваходны від�азванок"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Уваходны званок"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s про�іць від�аразмовы. �дкажаце?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s·про�іць размовы. �дкажаце?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Уваходны званок ад %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Скінуць"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_�дказаць"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_�дказаць з від�а"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Уваходны від�азванок ад %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Запраш�нне ў пакой дл� групавога чату"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Запраш�нне ў %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Удзельнік %s запрашае ва� далучыцца да %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_�дмовіцца"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Прын�ць запраш�нне"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "Удзельнік %s запра�іў ва� у %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Ва� запра�ілі ў %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Уваходны файл ад %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Патр�бны пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s про�іць дазволу на прагл�д вашага �еткавага �тану"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3979,7 +3871,11 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Вычы�ціць закончаны�, �ка�аваны� і н�ўдалы� перадачы файлаў з г�тага �пі�а"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "І_мпартаваць"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3987,170 +3883,185 @@ msgstr ""
 "�е ўдало�� адшукаць конты дл� імпартаванн�. Empathy пакуль падтрымлівае "
 "імпартаванне толькі дл� праграмы Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Імпартаванне контаў"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Імпартаванне"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Крыніца"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "�длучыцца"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба на�троіць конт."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�дпаведнікаў не знойдзена"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "�а жаль, пакуль вы не абновіце апраграмаванне %2$s, немагчыма будзе "
 "кары�тацца контамі %1$s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "�бнавіць апраграмаванне..."
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрыць"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Перазлучыцца"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Зм�ніць на�тройкі конта"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Папоўніць %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Папоўніць грашовы балан� конта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Папоўніць..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Кантакт"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба ўключыць �кі-небудзь конт."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба ўключыць %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спі� кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Кантакты на карце"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�а�тройкі конта"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Грашовы балан� конта"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ова� размова..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Пошук у �пі�е кантактаў"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�овы _званок..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Далучыцца да ўпадабаных пако�ў"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пошук кантактаў..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�а�тройка �пі�а ўпадабаных пако�ў"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Перадача _файлаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Звычайны памер акна"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Паказваць _кантакты па-за �еткай"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�овы _званок..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Паказваць інфармацыю аб пратаколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Звычайны памер акна з _аватарамі"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Грашовы балан� конта"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Кантакты на карце"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Конты"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Блакіраваны� кантакты"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_�а�тройкі"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Паказваць інфармацыю аб пратаколе"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Пошук у �пі�е кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Сартаваць паводле і_мёнаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Сартаваць паводле �_тану"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Конты"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Звычайны памер акна з _аватарамі"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Блакіраваны� кантакты"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Звычайны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Кампактны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Перадача _файлаў"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Пак_ой"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Далучыцца..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_�ова� размова..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Паказваць _кантакты па-за �еткай"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_��абі�ты� зве�ткі"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Пак_ой"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Далучыцца да ўпадабаных пако�ў"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пошук кантактаў..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�а�тройка �пі�а ўпадабаных пако�ў"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4162,7 +4073,7 @@ msgstr "Удзельнікі"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4175,22 +4086,27 @@ msgstr ""
 "Патрабуецца пароль: %s\n"
 "Удзельнікі: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е ўдало�� атрымаць �пі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е ўдало�� �пыніць атрыманне �пі�а пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е ўдало�� загрузіць �пі� пако�ў"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Увай�ці ў пакой"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4200,6 +4116,10 @@ msgstr ""
 "пако�ў �а �пі�а."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Пак_ой:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4207,18 +4127,14 @@ msgstr ""
 "Упішыце назву �ервера, �кі зм�шчае пакой, або пакіньце графу пу�той, калі ён "
 "зм�шчаецца на галоўным �ерверы конта"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Увай�ці ў пакой"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е ўдало�� загрузіць �пі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Пак_ой:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "�трыманне паведамленн�"
@@ -4232,7 +4148,7 @@ msgid "New conversation"
 msgstr "�ова� размова"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Уваход кантакту ў �етку"
 
 #: ../src/empathy-preferences.c:170
@@ -4252,327 +4168,357 @@ msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Мары��"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Грышка"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "�х, Грышка, н�добры! Як ты �палохаў м�не, гневаю�� не жартам!.."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Гневаеш��? ��праўда! � чаму ж ты на м�не так міленька пазіраеш?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 "Так, �а зло�ці!.. Дзе ты забаўл�ў��? Г�та ж зараз прыйдуць бацькі, а мы так "
 "многа маем з табою перагаварыць."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "Выбачай, − чуць золак, � з'ездзіў ужо да ме�та, кінуў�� ў ногі а���ару і "
 "пра�іў, каб ён уз�ў на� пад �ваю апеку."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Тр�ба было завезці �кі га�цінчык."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Удзельнік Мары�� ц�пер па-за �еткай"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�а�тройкі"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Паказваць вы�вы _заме�т �майлікаў"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Паказваць �пі� кантактаў у пако�х"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Выгл�д"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Паводзіны"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "�дкрываць чат у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Матыў аздабленн� чату:"
+msgid "new ta_bs"
+msgstr "новай _картцы"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Выключаць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
+msgid "new _windows"
+msgstr "новым _акне"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Выключыць гукавы� �ігналы ў р�жыме _ад�утна�ці ці зан�та�ці"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Паказваць уваходны� паведамленні ў абшары апав�шч�нн�ў"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�ўтаматычна злучацца пры запу�ку"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Фільтрацы� р�ха дапамагае палепшыць �ка�ць гучанн� вашага гола�у дл� "
-"�уразмоўцы, але можа выклікаць на некаторых камп'ютарах п�ўны� праблемы. "
-"Калі вы ці ваш �уразмоўца падча� размовы чуеце дзіўны шум ці шчаўчкі, "
-"па�прабуйце выключыць фільтрацыю р�ха і паўтарыць званок."
+msgid "Log conversations"
+msgstr "Ве�ці журнал размоў"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "�пав�шчаць, калі кантакт уваходзіць у �етку"
+msgid "Behavior"
+msgstr "Паводзіны"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "�пав�шчаць, калі кантакт выходзіць з �еткі"
+msgid "General"
+msgstr "�гульнае"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "�пав�шчаць, калі акно _чату не мае фоку�у"
+msgid "_Enable bubble notifications"
+msgstr "_Уключыць апав�шч�нні ў вына�ках"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
+msgid "Disable notifications when _away or busy"
+msgstr "Выключаць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "�гульнае"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "�пав�шчаць, калі акно _чату не мае фоку�у"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "�пав�шчаць, калі кантакт уваходзіць у �етку"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Крыніцы даных аб ме�цазнаходжанні:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "�пав�шчаць, калі кантакт выходзіць з �еткі"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Ве�ці журнал размоў"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "�пав�шч�нні"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_�гучваць апав�шч�нні"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "�гучваць падзеі"
+msgid "Disable sounds when _away or busy"
+msgstr "Выключыць гукавы� �ігналы ў р�жыме _ад�утна�ці ці зан�та�ці"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Прыватна�ць"
+msgid "Play sound for events"
+msgstr "�гучваць падзеі"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Пагоршана� дакладна�ць даных аб ме�цазнаходжанні азначае, што публікавацца "
-"будуць толькі даны� аб горадзе, штаце і краіне вашага ме�цазнаходжанн�. GPS-"
-"каардынаты будуць акруглены да 1 знака па�л� ко�кі."
+msgid "Sounds"
+msgstr "Гукі"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Паказваць вы�вы _заме�т �майлікаў"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Ужыць фільтрацыю р�ха дл� пал�пш�нн� �ка�ці гучанн� званкоў"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "_Паказваць �пі� кантактаў у пако�х"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Гукі"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Праверка арфаграфіі"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Фільтрацы� р�ха дапамагае палепшыць �ка�ць гучанн� вашага гола�у дл� "
+"�уразмоўцы, але можа выклікаць на некаторых камп'ютарах п�ўны� праблемы. "
+"Калі вы ці ваш �уразмоўца падча� размовы чуеце дзіўны шум ці шчаўчкі, "
+"па�прабуйце выключыць фільтрацыю р�ха і паўтарыць званок."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
+msgid "_Publish location to my contacts"
+msgstr "_Паведамл�ць маім кантактам аб ме�цазнаходжанні"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Матывы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Ужыць фільтрацыю р�ха дл� пал�пш�нн� �ка�ці гучанн� званкоў"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Пагоршана� дакладна�ць даных аб ме�цазнаходжанні азначае, што публікавацца "
+"будуць толькі даны� аб горадзе, штаце і краіне вашага ме�цазнаходжанн�. GPS-"
+"каардынаты будуць акруглены да 1 знака па�л� ко�кі."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Вары�нт:"
+msgid "_Reduce location accuracy"
+msgstr "Па_гаршаць дакладна�ць ме�цазнаходжанн�"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_�ўтаматычна злучацца пры запу�ку"
+msgid "Privacy"
+msgstr "Прыватна�ць"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Мабільны т�лефон"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Уключыць апав�шч�нні ў вына�ках"
+msgid "_Cellphone"
+msgstr "_Мабільны т�лефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_�гучваць апав�шч�нні"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Сетка (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Крыніцы даных аб ме�цазнаходжанні:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_�дкрываць новы� размовы ў а�обных вокнах"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Паведамл�ць маім кантактам аб ме�цазнаходжанні"
+msgid "Enable spell checking for languages:"
+msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Праверка арфаграфіі"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "Па_гаршаць дакладна�ць ме�цазнаходжанн�"
+msgid "Chat Th_eme:"
+msgstr "_Матыў аздабленн� чату:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Вары�нт:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Матывы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Вый�ці"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Зноў пазваніць кантакту"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Выключыць камеру"
+msgid "Redial"
+msgstr "Перазваніць"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Уключыць камеру"
+msgid "V_ideo"
+msgstr "_Від�а"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Выключыць від�а"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключыць від�акамеру і �пыніць перадачу від�а�ігналу"
+msgid "Video Preview"
+msgstr "Пап�р�дні агл�д від�а"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Уключыць від�акамеру і пачаць перадачу від�а�ігналу"
+msgid "Video On"
+msgstr "Уключыць від�а"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Уключыць від�акамеру, але не пачынаць перадачу від�а�ігналу"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Яшч� раз пазваніць кантакту"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Пап�р�дні агл�д"
+msgid "Camera Off"
+msgstr "Выключыць камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перазваніць"
+msgid "Disable camera and stop sending video"
+msgstr "Выключыць камеру і пера�таць па�ылаць від�а�ігнал"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Від�а"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Пап�р�дні агл�д"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Выключыць від�а"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Уключыць камеру, але не па�ылаць від�а�ігнал"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Уключыць від�а"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Уключыць камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Пап�р�дні від�аагл�д"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Уключыць камеру і па�ылаць від�а�ігнал"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Прагл�д карты кантактаў"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Захаваць"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Спа�ылка pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "�дказ pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"�адта шмат даных дл� адной у�таўкі. Заме�т г�тага захавайце журнал у файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "�кно адладкі"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Па�лаць �к pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Узровень "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "�дладка"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Інфармацы�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Пап�р�джанне"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Крытычна� памылка"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Памылка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Ча�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Дамен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Кат�горы�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Узровень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4592,38 +4538,34 @@ msgstr "Выберыце кантакт, каб запраÑ�іць Ñ�го да Ñ
 msgid "Invite"
 msgstr "Запра�іць"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е паказваць ды�логавых акенцаў; выканаць працу (напрыклад, імпартаванне) і "
 "вый�ці"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е паказваць ды�логавых акенцаў, калі толькі не і�нуе іншых контаў акрам� "
 "\"Людзей паблізу\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спачатку вылучыць азначаны конт (напрыклад, \"gabble/jabber/"
 "foo_40example_2eorg0\")"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ід�нтыфікатар-конта>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Паказаць памочніка контаў"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Конты Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Конты Empathy"
 
@@ -4639,47 +4581,47 @@ msgstr "- �дладчык Empathy"
 msgid "Empathy Debugger"
 msgstr "�дладчык Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Кліент чату Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "�дказаць"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Скінуць"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "�дказаць"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "�дказаць з від�а"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "�дмовіцца"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прын�ць"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
@@ -4687,38 +4629,38 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Ñ–"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "У чаканні"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "�б�згучана"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Прац�гла�ць"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d хв"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Б�гучы балан�: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вам не �тае грошай, каб выканаць г�ты званок."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Папоўніць"
 
@@ -4726,6 +4668,33 @@ msgstr "Папоўніць"
 msgid "_Match case"
 msgstr "_Улічваць р�гі�тр літар"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Тып вашага конта дл� чату"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Ствар�нне новага конта"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Людзі паблізу"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, �кі� "
+"кары�таюцца вашай �еткай. Калі вы хочаце выкары�таць г�ту магчыма�ць, "
+"праверце правільна�ць на�троек, пададзеных ніж�й."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Пазней можна будзе зм�ніць г�ты� на�тройкі або наогул выключыць г�ту "
+"функцыю, выбраўшы <span style=\"italic\">Праўка → Конты</span> ў �пі�е "
+"кантактаў."
diff --git a/po/bg.po b/po/bg.po
index 31d73e329..a92e0db19 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,10 +1,10 @@
 # Bulgarian translation of empathy po-file.
-# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Copyright (C) 2010 Damyan Ivanov
 # Copyright (C) 2011 Krasimir Chonov
 # This file is distributed under the same license as the empathy package.
 # Yasen Pramatarov <yasen@lindeas.com>, 2004.
-# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011.
+# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011, 2012.
 # Yavor Doganov <yavor@gnu.org>, 2009.
 # Damyan Ivanov <dam+gnome@ktnx.net>, 2010, 2011.
 # Krasimir Chonov <mk2616@abv.bg>, 2011.
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-15 10:04+0300\n"
-"PO-Revision-Date: 2011-10-15 10:04+0300\n"
-"Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
+"POT-Creation-Date: 2012-03-12 20:25+0200\n"
+"PO-Revision-Date: 2012-03-12 20:25+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -24,523 +24,580 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Разговори чрез Google Talk, Фей�бук, MSN и много други у�луги за моментни "
-"�ъобщени�"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Клиент за моментни �ъобщени�"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Моментни �ъобщени� � Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Клиент за моментни �ъобщени�"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Разговори чрез Google Talk, Фей�бук, MSN и много други у�луги за моментни "
+"�ъобщени�"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Съобщени� и телефони�"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление на реги�трациите за �ъобщени� и телефони� през Интернет"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "�овите разговори да �е отвар�т в отделни прозорци."
+msgid "Connection managers should be used"
+msgstr "Да �е използва управление на връзката"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Сила на звука при повикване"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Дали да �е използват програми за управление на връзките за автоматичното им "
+"прекъ�ване и въз�танов�ване."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Сила на звука при повикване в проценти."
+msgid "Empathy should auto-connect on startup"
+msgstr "�втоматично �вързване при �тартиране"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Уеб камера"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Дали Empathy автоматично да включва реги�трациите ви при �тартиране."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Позици� на камерата"
+msgid "Empathy should auto-away when idle"
+msgstr "�втоматично преминаване в �ъ�то�ние „От�ъ�тващ“ при бездей�твие"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Знак, който да �е добави �лед п�евдонима при ползване на допи�ване на "
-"п�евдоними (� табулатор) в прозореца за групови разговори."
+"Дали Empathy автоматично да преминава в �ъ�то�ние „От�ъ�тващ“ при "
+"бездей�твие на потребител�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Графична тема за прозореца за разговори"
+msgid "Empathy default download folder"
+msgstr "Стандартна папка за получените файлове от Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Графична тема за прозореца за разговори"
+msgid "The default folder to save file transfers in."
+msgstr "Стандартната папка, в ко�то да �е запазват получените файлове."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Спи�ък от двубуквените �ъкращени� на езиците � проверка за правопи� "
-"разделени �ъ� запета� (напр. „bg, en, ru“)."
+"Магиче�ко чи�ло дали да �е изпълн�т задачите по изчи�тване на на�тройките до "
+"нормално положение"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Стегнат �пи�ък � контакти"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c използва това чи�ло, за да реши дали да �е "
+"изпълн�т задачите по изчи�тване на на�тройките до нормално положение. "
+"Потребителите не тр�бва да промен�т този ключ ръчно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Да �е използва управление на връзката"
+msgid "Show offline contacts"
+msgstr "Показване на контактите, които не �а в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Критерий за подредбата на �пи�ъка � контактите"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+"Дали контактите, които в момента не �а включени да �е показват в �пи�ъка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
+msgid "Show avatars"
+msgstr "Показване на аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Дали да �е показват аватари в �пи�ъците за контакти и прозорците за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Default directory to select an avatar image from"
-msgstr "Стандартна папка, в ко�то да �е тър��т изображени� за аватари"
+msgid "Show protocols"
+msgstr "Показване на протокола"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable popup notifications when away"
-msgstr "Без изве�т�ване � из�качащи прозорци в �ъ�то�ние „От�ъ�тващ“"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Дали да �е показват протоколите в �пи�ъците за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Disable sounds when away"
-msgstr "Без звуци звуци в �ъ�то�ние „От�ъ�тващ“"
+msgid "Show Balance in contact list"
+msgstr "Показване на кредита в �пи�ъка � контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Display incoming events in the status area"
-msgstr "Показване на вход�щи �ъбити� в обла�тта за �ъ�то�нието"
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+"Дали да �е показва о�таващи�т кредит на реги�траци�та в �пи�ъка за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показване на вход�щите �ъбити� в обла�тта за �ъ�то�нието. �ко е лъжа, "
-"�ъбити�та �е пред�тав�т незабавно на потребител�."
+msgid "Compact contact list"
+msgstr "Стегнат �пи�ък � контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Echo cancellation support"
-msgstr "Премахване на ехо"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Дали да �е ползва �тегнат изглед за �пи�ъка � контактите."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can publish the user's location"
-msgstr "Empathy може да публикува ме�тоположението на потребител�"
+msgid "Hide main window"
+msgstr "Скриване на о�новни� прозорец"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy може да ползва GPS, за да отгатне ме�тоположението"
+msgid "Hide the main window."
+msgstr "Скриване на о�новни� прозорец."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy може да използва мобилна телефонна мрежа, за да отгатне "
-"ме�тоположението"
+msgid "Default directory to select an avatar image from"
+msgstr "Стандартна папка, в ко�то да �е тър��т изображени� за аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy може да ползва мрежата, за да отгатне ме�тоположението"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "По�ледната папка, от ко�то е взето изображение за аватар."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy default download folder"
-msgstr "Стандартна папка за получените файлове от Empathy"
+msgid "Open new chats in separate windows"
+msgstr "Отвар�не на разговорите в отделни прозорци"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "�втоматично преминаване в �ъ�то�ние „От�ъ�тващ“ при бездей�твие"
+msgid "Always open a separate chat window for new chats."
+msgstr "�овите разговори да �е отвар�т в отделни прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "�втоматично �вързване при �тартиране"
+msgid "Display incoming events in the status area"
+msgstr "Показване на вход�щи �ъбити� в обла�тта за �ъ�то�нието"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "�амал�ване на точно�тта на ме�тоположението"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Показване на вход�щите �ъбити� в обла�тта за �ъ�то�нието. �ко е лъжа, "
+"�ъбити�та �е пред�тав�т незабавно на потребител�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
+msgid "The position for the chat window side pane"
+msgstr "Разположение на �траничната лента в прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Включване на ин�трументите за разработка на WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"Запомненото разположение (в пик�ели) на �траничната лента в прозореца за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Изве�т�ване � из�качащи прозорци при нови �ъобщени�"
+msgid "Show contact groups"
+msgstr "Показване на групите � контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Да �е ползва проверка на правопи�а"
+msgid "Whether to show groups in the contact list."
+msgstr "Дали да �е показват групите в �пи�ъка за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Скриване на о�новни� прозорец"
+msgid "Contact list sort criterion"
+msgstr "Критерий за подредбата на �пи�ъка � контактите"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Скриване на о�новни� прозорец."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Кой критерий да �е използва за подредбата на �пи�ъка � контактите. "
+"Стандартната �тойно�т е „state“ — подреждане по �ъ�то�ние.  Стойно�т „name“ "
+"�мен� на подредба по име."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Last account selected in Join Room dialog"
-msgstr ""
+msgid "Use notification sounds"
+msgstr "Изве�т�ване �ъ� звуци"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Nick completed character"
-msgstr "Знак за допи�ване на п�евдоними"
+msgid "Whether to play a sound to notify of events."
+msgstr "Дали �ъбити�та да �е изве�т�ват �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Open new chats in separate windows"
-msgstr "Отвар�не на разговорите в отделни прозорци"
+msgid "Disable sounds when away"
+msgstr "Без звуци звуци в �ъ�то�ние „От�ъ�тващ“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use"
-msgstr "Път до темата на Adium, ко�то да �е ползва"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Път до темата на Adium, ко�то да �е ползва, ако темата за разговори е Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Изве�т�ване �ъ� звук при при�тигане на �ъобщение"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for new conversations"
-msgstr "Изве�т�ване �ъ� звук при нов разговор"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Дали при�тигането на �ъобщени� да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Изве�т�ване �ъ� звук при изпращане на �ъобщение"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Дали изпращането на �ъобщени� да �е изве�т�ва �ъ� звук."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs in"
-msgstr "Изве�т�ване �ъ� звук при влизане на контакт в мрежата"
+msgid "Play a sound for new conversations"
+msgstr "Изве�т�ване �ъ� звук при нов разговор"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs out"
-msgstr "Изве�т�ване �ъ� звук при излизане на контакт от мрежата"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Дали новите разговори да �е изве�т�ват �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log in"
-msgstr "Изве�т�ване �ъ� звук при влизането ви в мрежата"
+msgid "Play a sound when a contact logs in"
+msgstr "Изве�т�ване �ъ� звук при влизане на контакт в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log out"
-msgstr "Изве�т�ване �ъ� звук при излизането ви от мрежата"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Дали влизането на контакти в мрежата да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Изве�т�ване � из�качащи прозорци, когато разговорът не е на фоку�"
+msgid "Play a sound when a contact logs out"
+msgstr "Изве�т�ване �ъ� звук при излизане на контакт от мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs in"
-msgstr "Изве�т�ване � из�качащи прозорци, когато контакт влезе в мрежата"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Дали излизането на контакти от мрежата да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs out"
-msgstr "Изве�т�ване � из�качащи прозорци, когато контакт излезе извън мрежата"
+msgid "Play a sound when we log in"
+msgstr "Изве�т�ване �ъ� звук при влизането ви в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Position the camera preview should be during a call."
-msgstr ""
-"Позиционирането на изображението от камерата да �тава по време на разговор."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Дали влизането ви в мрежата да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show Balance in contact list"
-msgstr "Показване на кредита в �пи�ъка � контакти"
+msgid "Play a sound when we log out"
+msgstr "Изве�т�ване �ъ� звук при излизането ви от мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show avatars"
-msgstr "Показване на аватари"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Дали излизането ви от мрежата да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show contact list in rooms"
-msgstr "Показване на �пи�ъка � контакти в �таите"
+msgid "Enable popup notifications for new messages"
+msgstr "Изве�т�ване � из�качащи прозорци при нови �ъобщени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show hint about closing the main window"
-msgstr "Под�казване за затвар�нето на о�новни� прозорец"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Дали получаването на ново �ъобщение да �е изве�т�ва � из�качащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show offline contacts"
-msgstr "Показване на контактите, които не �а в мрежата"
+msgid "Disable popup notifications when away"
+msgstr "Без изве�т�ване � из�качащи прозорци в �ъ�то�ние „От�ъ�тващ“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show protocols"
-msgstr "Показване на протокола"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва � из�качащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Spell checking languages"
-msgstr "Езици � проверка на правопи�а"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Изве�т�ване � из�качащи прозорци, когато разговорът не е на фоку�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The default folder to save file transfers in."
-msgstr "Стандартната папка, в ко�то да �е запазват получените файлове."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Дали получаването на ново �ъобщение, когато отворени�т прозорец за разговори "
+"не е на фоку�, да �е изве�т�ва � из�качащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледната папка, от ко�то е взето изображение за аватар."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Изве�т�ване � из�качащи прозорци, когато контакт влезе в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The position for the chat window side pane"
-msgstr "Разположение на �траничната лента в прозореца за разговори"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Дали влизането на контакт в мрежата да �е изве�т�ва � из�качащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"Запомненото разположение (в пик�ели) на �траничната лента в прозореца за "
-"разговори."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Изве�т�ване � из�качащи прозорци, когато контакт излезе извън мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Графичната тема за прозорците за разговори."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Дали излизането на контакт извън мрежата да �е изве�т�ва � из�качащи "
+"прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Графичната тема за прозорците за разговори."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Изображени� за емотикони"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Дали емотиконите да �е преобразуват от ASCII в картинки."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use notification sounds"
-msgstr "Изве�т�ване �ъ� звуци"
+msgid "Show contact list in rooms"
+msgstr "Показване на �пи�ъка � контакти в �таите"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use theme for chat rooms"
-msgstr "Графична тема за прозорците за разговори"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Дали �пи�ъкът � контакти да �е показва в �таите за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Дали Empathy да публикува ме�тоположението на потребител� към контактите."
+msgid "Chat window theme"
+msgstr "Графична тема за прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Дали Empathy да използва GPS за изчи�л�ване на ме�тоположението."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Графичната тема за прозорците за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Дали Empathy да използва мрежа за мобилни телефони за изчи�л�ване на "
-"ме�тоположението."
+msgid "Chat window theme variant"
+msgstr "Графична тема за прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Дали Empathy да използва мрежата за изчи�л�ване на ме�тоположението."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Графичната тема за прозорците за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Дали Empathy автоматично да включва реги�трациите ви при �тартиране."
+msgid "Path of the Adium theme to use"
+msgstr "Път до темата на Adium, ко�то да �е ползва"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Дали Empathy автоматично да преминава в �ъ�то�ние „От�ъ�тващ“ при "
-"бездей�твие на потребител�."
+"Път до темата на Adium, ко�то да �е ползва, ако темата за разговори е Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Дали Empathy да намал�ва точно�тта на ме�тоположението, за да защитава "
-"личните данни."
+msgid "Enable WebKit Developer Tools"
+msgstr "Включване на ин�трументите за разработка на WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Дали Empathy да ползва аватара на контакта за икона на прозореца за "
-"разговори."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Дали ин�трументите към WebKit за разработка (напр. уеб ин�пекторът) да �е "
 "включат."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Информиране на другите уча�тници, че им пишете"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Дали да �е използват програми за управление на връзките за автоматичното им "
-"прекъ�ване и въз�танов�ване."
+"Дали да �е изпращат �ъ�то�ни� „Пишещ“ или „Спр�л“. За момента те не �е "
+"пращат, когато о�новното �ъ�то�ние е „От�ъ�тващ“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Дали да �е прави проверка на правопи�а на въведени� тек�т �пр�мо избраните "
-"езици."
+msgid "Use theme for chat rooms"
+msgstr "Графична тема за прозорците за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Дали емотиконите да �е преобразуват от ASCII в картинки."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Дали да �е ползва графична тема за �таите за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Дали да �е използва филтърът за премахване на шумове в Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Езици � проверка на правопи�а"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Дали влизането на контакти в мрежата да �е изве�т�ва �ъ� звук."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спи�ък от двубуквените �ъкращени� на езиците � проверка за правопи� "
+"разделени �ъ� запета� (напр. „bg, en, ru“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Дали излизането на контакти от мрежата да �е изве�т�ва �ъ� звук."
+msgid "Enable spell checker"
+msgstr "Да �е ползва проверка на правопи�а"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Дали �ъбити�та да �е изве�т�ват �ъ� звук."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Дали да �е прави проверка на правопи�а на въведени� тек�т �пр�мо избраните "
+"езици."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Дали при�тигането на �ъобщени� да �е изве�т�ва �ъ� звук."
+msgid "Nick completed character"
+msgstr "Знак за допи�ване на п�евдоними"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Дали новите разговори да �е изве�т�ват �ъ� звук."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак, който да �е добави �лед п�евдонима при ползване на допи�ване на "
+"п�евдоними (� табулатор) в прозореца за групови разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Дали изпращането на �ъобщени� да �е изве�т�ва �ъ� звук."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Дали влизането ви в мрежата да �е изве�т�ва �ъ� звук."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Дали Empathy да ползва аватара на контакта за икона на прозореца за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Дали излизането ви от мрежата да �е изве�т�ва �ъ� звук."
+msgid "Last account selected in Join Room dialog"
+msgstr "По�ледната реги�траци� използвана в прозореца „Влизане в �та�“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва �ъ� звук."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Път до обекта в D-Bus на по�ледната реги�траци�, използвана за влизане в "
+"�та�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Дали излизането на контакт извън мрежата да �е изве�т�ва � из�качащи "
-"прозорци."
+msgid "Camera device"
+msgstr "Уеб камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Дали влизането на контакт в мрежата да �е изве�т�ва � из�качащи прозорци."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Дали получаването на ново �ъобщение, когато отворени�т прозорец за разговори "
-"не е на фоку�, да �е изве�т�ва � из�качащи прозорци."
+msgid "Camera position"
+msgstr "Позици� на камерата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Position the camera preview should be during a call."
 msgstr ""
-"Дали получаването на ново �ъобщение да �е изве�т�ва � из�качащи прозорци."
+"Позиционирането на изображението от камерата да �тава по време на разговор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
-"Дали да �е показва о�таващи�т кредит на реги�траци�та в �пи�ъка за контакти."
+msgid "Echo cancellation support"
+msgstr "Премахване на ехо"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Дали да �е показват аватари в �пи�ъците за контакти и прозорците за "
-"разговори."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Дали да �е използва филтърът за премахване на шумове в Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Дали контактите, които в момента не �а включени да �е показват в �пи�ъка."
+msgid "Show hint about closing the main window"
+msgstr "Под�казване за затвар�нето на о�новни� прозорец"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва � из�качащи прозорци."
+"Дали да �е показва �ъобщение за затвар�нето на о�новни� прозорец при "
+"нати�кане на бутона „×“ в заглавната лента."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Дали да �е показват протоколите в �пи�ъците за контакти."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy може да публикува ме�тоположението на потребител�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Дали �пи�ъкът � контакти да �е показва в �таите за разговори."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Дали Empathy да публикува ме�тоположението на потребител� към контактите."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Дали да �е ползва �тегнат изглед за �пи�ъка � контактите."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy може да ползва мрежата, за да отгатне ме�тоположението"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Дали да �е показва �ъобщение за затвар�нето на о�новни� прозорец при "
-"нати�кане на бутона „×“ в заглавната лента."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Дали Empathy да използва мрежата за изчи�л�ване на ме�тоположението."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Дали да �е ползва графична тема за �таите за разговори."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empathy може да използва мобилна телефонна мрежа, за да отгатне "
+"ме�тоположението"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Дали Empathy да използва мрежа за мобилни телефони за изчи�л�ване на "
+"ме�тоположението."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy може да ползва GPS, за да отгатне ме�тоположението"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Дали Empathy да използва GPS за изчи�л�ване на ме�тоположението."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "�амал�ване на точно�тта на ме�тоположението"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Кой критерий да �е използва за подредбата на �пи�ъка � контактите. "
-"Стандартната �тойно�т е „name“ — подредба по име. Стойно�т „state“ означава "
-"подреждане по �ъ�то�ние."
+"Дали Empathy да намал�ва точно�тта на ме�тоположението, за да защитава "
+"личните данни."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление на реги�трациите за �ъобщени� и телефони� през Интернет"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "�е е указана причина"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Съобщени� и телефони�"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "За�вена бе пром�на в �ъ�то�нието"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Преу�тановихте прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "От�рещната �трана преу�танови прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Грешка по време на прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "От�рещната �трана не може да прехвърл� файл"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "�еизве�тна причина"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прехвърл�нето на файл завърши, но файлът е повреден"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Отдалечени�т контакт не поддържа прехвърл�не на файлове"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Избрани�т файл не е обикновен файл"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Избрани�т файл е празен"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропу�нато повикване от %s"
@@ -556,170 +613,138 @@ msgstr "%s ви потър�и"
 msgid "Call from %s"
 msgstr "Повикване от %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Този вид гнездо не �е поддържа"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "�е е указана причина"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "За�вена бе пром�на в �ъ�то�нието"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Преу�тановихте прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "От�рещната �трана преу�танови прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Грешка по време на прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "От�рещната �трана не може да прехвърл� файл"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "�еизве�тна причина"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "�а лини�"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зает"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "От�ъ�тващ"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидим"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Извън мрежата"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "�е е указана причина"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Съ�то�нието е „Извън мрежата“."
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:75
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�еу�пешно идентифициране"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Грешка в шифрирането"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Името е заето"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "�е е предо�тавен �ертификат"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификатът е изтекъл"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификатът не е вл�зъл в �ила"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�е�ъвпадение на името � това в �ертификата"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�е�ъвпадение на отпечатъка на �ертификата"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификатът е �амоподпи�ан"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Грешка в �ертификата"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "�е е налично шифриране"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертификатът е неправилен"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Връзката е отказана"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е може да �е у�танови връзка"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Връзката прекъ�на"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ре�ур�ът вече е �вързан към �ървъра"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Реги�траци�та вече е �вързана към �ървъра"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Връзката бе заме�тена от нова връзка, използваща �ъщи� ре�ур�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "�а �ървъра вече има реги�траци� � такова име."
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "В момента �ървърът е твърде натоварен, за да обработи за�вката за �вързване"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификатът е анулиран"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификатът използва не�игурен шифър или �лаб алгоритъм за шифриране"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -727,289 +752,279 @@ msgstr ""
 "Дължината на �ертификата на �ървъра или дълбочината на �ертификационната му "
 "верига надхвърл� ограничени�та на криптограф�ката библиотека"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
-msgstr ""
+msgstr "Софтуерът ви е прекалено о�тар�л"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Вътрешна грешка"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Хора наблизо"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! от Япони�"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
 # Би тр�бвало тран�литерирани� вариант „Фей�бук“ да е наложен вече
 # �поред http://www.ivosiromahov.com/2_article/a46.html.
 # Иво Сиромахов като лингви�тичен тренд�етър, мали, мали!
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Разговор във Фей�бук"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "преди %d �екунда"
 msgstr[1] "преди %d �екунди"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d ча�"
 msgstr[1] "преди %d ча�а"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "преди %d �едмица"
 msgstr[1] "преди %d �едмици"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d ме�ец"
 msgstr[1] "преди %d ме�еца"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в бъдеще"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Паролата не е открита"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Парола за %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Парола за �та� за разговор „%s“ на реги�траци�та %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "В�ички реги�трации"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Реги�траци�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Парола"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сървър"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Моите уеб реги�трации"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Реги�траци�та %s �е редактира чрез %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Реги�траци�та %s не може да �е редактира в Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Стартиране на „Моите уеб реги�трации“"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Редактиране на %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Потребител�ко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Прилагане"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Включване в мрежата"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Вече има реги�траци� � такова име на �ървъра."
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Създаване на нова реги�траци� на �ървъра"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Отказ"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Реги�траци� в %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ова реги�траци�"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> МоетоИме"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "П_арола:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Допълнителни"
+msgid "Screen _Name:"
+msgstr "_П�евдоним:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> МоетоИме"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "П_арола:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомн�не"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомн�не"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Запомн�не"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_П�евдоним:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сървър:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Каква е паролата ви за AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Допълнителни"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Какво е името ви в мрежата на AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Каква е паролата ви за AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сървър:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> потребител�ко_име"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомн�не"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Идентификатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> потребител�ко_име"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Какъв е идентификаторът ви в GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Каква е паролата ви в GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "И_дентификатор за ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Кодиране:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "И_дентификатор за ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Какъв е идентификаторът ви за ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Каква е паролата ви за ICQ?"
 
@@ -1046,11 +1061,23 @@ msgstr "�а�тройки"
 msgid "None"
 msgstr "Без"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мрежа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мрежа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодиране:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сървъри"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1058,14 +1085,6 @@ msgstr ""
 "Повечето IRC �ървъри н�мат нужда от парола, така че ако не �те �игурни, не "
 "въвеждайте парола."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мрежа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мрежа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "П�евдоним:"
@@ -1082,48 +1101,20 @@ msgstr "Съобщение при напу�кане:"
 msgid "Real name:"
 msgstr "И�тин�ко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сървъри"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Какво е името ви в мрежата за IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Ко� мрежа за IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> потребител@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> потребител@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Задължително шифрриране (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Пренебрегване на грешките в �ертификата за SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Използване на �об�твените на�тройки"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Пр_иоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Какво е името ви в мрежата за IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Ре�ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Какво е името ви във Фей�бук?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1137,183 +1128,207 @@ msgstr ""
 "�ко н�мате такова име във Фей�бук, �ъздайте �и чрез <a href=\"http://www."
 "facebook.com/username/\">тази �траница</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Използване на _�тар SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Каква е паролата ви във Фей�бук?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Какво е името ви във Фей�бук?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Какъв е идентификаторът ви в Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> потребител@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Каква е паролата ви в Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> потребител@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Пренебрегване на грешките в �ертификата за SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Пр_иоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ре�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Задължително шифрриране (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Използване на _�тар SSL"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Използване на �об�твените на�тройки"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Какъв е идентификаторът ви за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Каква е паролата ви за Джабър?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Какъв е желани�т от ва� идентификатор за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Каква е паролата ви за Джабър?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Каква е желаната от ва� парола за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> потребител@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Какъв е идентификаторът ви Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Каква е паролата ви за Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "�дре� на _е-поща:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "П�евдо_ним:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Фамилно име:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Лично име:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Име за п_убликуване:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Ид_ентификатор за Джабър:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Фамилно име:"
+msgid "E-_mail address:"
+msgstr "�дре� на _е-поща:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Име за п_убликуване:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Потребител�ко _име:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> потребител@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Потребител�ко име:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Откриване на �вързването"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�втоматично откриване на �ървъра за STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Използване на тази реги�траци� за прове_ждане на разговори � наземни и "
+"мобилни мрежи"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Игнориране на TLS грешки"
+msgid "NAT Traversal Options"
+msgstr "�а�тройки за преминаването през NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Интервал [�ек.]"
+msgid "Proxy Options"
+msgstr "Сървър-по�редник"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "�а�тройки на поддържането на връзката"
+msgid "Miscellaneous Options"
+msgstr "Допълнителни на�тройки"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Свободна маршрутизаци�"
+msgid "STUN Server:"
+msgstr "Сървър за STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизъм:"
+msgid "Discover the STUN server automatically"
+msgstr "�втоматично откриване на �ървъра за STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Допълнителни на�тройки"
+msgid "Discover Binding"
+msgstr "Откриване на �вързването"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "�а�тройки за преминаването през NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сървър:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "�а�тройки на поддържането на връзката"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизъм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Сървър-по�редник"
+msgid "Interval (seconds)"
+msgstr "Интервал [�ек.]"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Потребител�ко име:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сървър за STUN:"
+msgid "Loose Routing"
+msgstr "Свободна маршрутизаци�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Сървър:"
+msgid "Ignore TLS Errors"
+msgstr "Игнориране на TLS грешки"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"Използване на тази реги�траци� за прове_ждане на разговори � наземни и "
-"мобилни мрежи"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Каква е паролата ви за SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какво е потребител�кото ви име за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Потребител�ко _име:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Каква е паролата ви за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "И_дентификатор на Yahoo:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr ""
 "_Да не �е обръща внимание на поканите за конферентни разговори и �таи за "
 "разговори"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локал на �пи�ъка �ъ� �таи:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Какъв е идентификаторът ви в Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Каква е паролата ви в Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "И_дентификатор на Yahoo:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локал на �пи�ъка �ъ� �таи:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1351,67 +1366,67 @@ msgstr "В�ички файлове"
 msgid "Click to enlarge"
 msgstr "�ати�нете за увеличаване"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Възникна грешка при започването на разговор."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Избрани�т контакт не поддържа повиквани�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Избрани�т контакт е извън лини�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Избрани�т контакт е неправилен"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "С този протокол не могат да �е провеждат разговори за �пешни �лучаи"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
-msgstr ""
+msgstr "��мате до�татъчно кредит, за да извършите това обаждане"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "�еу�пешно започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "В този разговор не �е поддържа тема"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "��мате право да �мените темата"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ не е правилно име на контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: изчи�тване на в�ички �ъобщени� в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: задаване на темата на текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1419,26 +1434,26 @@ msgstr ""
 "/part [<идентификатор на �та� за разговор>] [<причина>]: напу�кане на �та�, "
 "по подразбиране текущата"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <идентификатор на контакт> [<�ъобщение>]: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <идентификатор на контакт> <�ъобщение>: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <пр�кор>: �м�на на пр�кора ви за текущи� �ървър"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <�ъобщение>: изпращане на �ъобщение „за дей�твие“ в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1448,11 +1463,11 @@ msgstr ""
 "при �ъобщени� започващи � „/“. �апр.: „/say /join �е използва за влизане в "
 "нова �та� за разговор“"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <контакт>: показва информаци� за контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1460,121 +1475,128 @@ msgstr ""
 "/help [<команда>]: показване на в�ички поддържани команди. �ко има такава "
 "<команда>, �е показва нейната употреба."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Употреба: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "�еизве�тна команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�еизве�тна команда. Пробвайте � „/help“ — ще �е изведат поддържаните команди"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "недо�татъчен кредит за изпращане на �ъобщението"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при изпращането на �ъобщението „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Грешка при изпращането на �ъобщението: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr "недо�татъчен кредит за изпращане на �ъобщението"
+msgstr ""
+"недо�татъчен кредит за изпращане на �ъобщението. <a href='%s'>Захранване</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "лип�ва такава възможно�т"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "изключен"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "грешен контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "лип�ват права"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "прекалено дълго �ъобщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "не е реализирано"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "неизве�тна грешка"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Темата вече е: „%s“"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s �мени темата на „%s“"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "�е е зададена тема"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(н�ма предложени�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добав�не на „%s“ към речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добав�не на „%s“ към речника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Вмъкване на емотикон"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Изпращане"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Предложени� за правопи�"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "�еу�пех при получаването на предишните разговори"
 
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s прекъ�на връзката"
@@ -1582,12 +1604,12 @@ msgstr "%s прекъ�на връзката"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s бе изритан от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s бе изритан"
@@ -1595,17 +1617,17 @@ msgstr "%s бе изритан"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s бе по�тавен под възбрана от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s бе по�тавен под възбрана"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s излезе от �та�та"
@@ -1615,17 +1637,17 @@ msgstr "%s излезе от �та�та"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s влезе в �та�та"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s в момента е познат като %s"
@@ -1633,90 +1655,90 @@ msgstr "%s в момента е познат като %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2836
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
-#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2642
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "И�кате ли паролата да �е запомни?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запомн�не"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "�е �ега"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�ов опит"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Паролата е грешна, пробвайте отново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ста�та изи�ква парола:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
-msgstr "При�ъедин�ване"
+msgstr "Влизане"
 
-#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "�епознат или неправилен идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирането на контакт временно е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Блокирането на контакт е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "До�тъпът е отказан"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Контактът не може да �е блокира"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Редактиране на блокирани контакти"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Реги�траци�:"
 
@@ -1726,335 +1748,189 @@ msgstr "Блокирани контакти"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Изтриване"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Копиране на адре�а"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвар�не на адре�а"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%d.%m.%Y, %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Редактиране на данните за контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Лични данни"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�ов контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокиране на „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Сигурни ли �те, че и�кате да забраните на „%s“ да �е �вързва � ва�?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Докладване на този контакт за злоупотреба"
 msgstr[1] "_Докладване на тези контакти за злоупотреба"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Отлагане на _решението"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "И�кане за запи�ване"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Сигурни ли �те, че и�кате да изтриете групата „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Изтриване на група"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Изтриване"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Сигурни ли �те, че и�кате да изтриете контакта „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Изтриване на контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Добав�не на контакт…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Блокиране на контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_�удио разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Предишни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Изпращане на файл"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Сподел�не на работното м��то"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "_Данни за контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Редактиране"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Получена е покана за тази �та�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "Изпращане на _покана за �та�та"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Отлагане на _решението"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Тър�ене на контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Контакт:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Добав�не на контакт"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "��ма намерени контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Съобщение � което �е пред�тав�те:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 "Позволете ми да виждам когато �те на лини�. Благодар�!\n"
 "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пълно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Телефонен номер:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "�дре� на е-поща:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Уеб�айт:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рожден ден:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "По�ледно вид�н:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Свързан от:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Съобщение при напу�кане:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Код на държавата по ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Щат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Пощен�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Сграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Етаж:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Ста�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опи�ание:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "�дре� в Интернет:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "�иво на точно�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Вертикална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Хоризонтална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Скоро�т:"
 
@@ -2062,120 +1938,184 @@ msgstr "Скоро�т:"
 # дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
 # терминологично в �ферата на мор�ката/въздушната навигаци�.
 # Пеленг �тава
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Пеленг:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Скоро�т на изкачване:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "По�ледно обнов�ване на:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Дължина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Широчина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Ви�очина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�тоположение"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y в %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Запазване на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�еу�пех при запазването на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Любимо"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични данни"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ме�тоположение</b> на (дата)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Подробни данни за контакта"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "П�евдоним:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Пълно име"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Данни за клиента"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Телефонен номер"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Клиент:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "�дре� на е-поща"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Подробни данни за контакта"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Уеб�айт"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рожден ден"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "По�ледно вид�н:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Свързан от:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Съобщение при напу�кане:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "работен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "домашен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гла�ови"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "предпочитан"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "пощен�ки"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "за до�тавка"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "П�евдоним:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ме�тоположение</b> на (дата)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Пратена е за�вка за информаци�…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Данни за клиента"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�и�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Клиент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групи"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2183,105 +2123,171 @@ msgstr ""
 "Изберете групите, в които контактът да �е по�в�ва. Можете да изберете 0 или "
 "повече групи."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добав�не на група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Избор"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1967
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следни�т контакт ще бъде блокиран:"
 msgstr[1] "Следните контакти ще бъдат блокирани:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следни�т контакт не може да бъде блокирана:"
 msgstr[1] "Следните контакти не могат да бъдат блокирани:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Свързани контакти"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изберете контакти за �вързване"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед на нов контакт"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Избраните контакти от �пи�ъка вл�во ще бъдат �вързани."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Редактиране на данните за контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изберете реги�траци� за провеждане на разговора"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Разговор"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Зает"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "��Ч�ЛО"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:295
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Блокиране на контакта"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Разговор"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_�удио разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Видео разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Предишни разговори"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Изпращане на файл"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Сподел�не на работното м��то"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Любимо"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Пакетът gnome-contacts не е ин�талиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Ин�талирайте пакета „gnome-contacts“, за да до�тъпите данните на контакта."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Данни за контакта"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Пром�на"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Свързване на контакти…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Получена е покана за тази �та�"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Изпращане на _покана за �та�та"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Добав�не на контакт…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Изтриване и _блокиране"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Сигурни ли �те, че и�кате да изтриете групата „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Изтриване на група"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Изтриване"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Сигурни ли �те, че и�кате да изтриете контакта „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2290,7 +2296,11 @@ msgstr ""
 "�аи�тина ли и�кате да изтриете �ъбирателни� контакт „%s“? В�ички контакти, "
 "които имат връзка � него, ще бъдат �ъщо изтрити."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Изтриване на контакт"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2301,23 +2311,23 @@ msgstr[1] "Събирателен контакт, �ъдържащ %u конта
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ме�тоположение</b> на (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "В мрежата през телефон или мобилно у�трой�тво"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова мрежа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Избор на мрежа за IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Изчи�тване на _�пи�ъка � мрежи"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Избор"
@@ -2330,299 +2340,251 @@ msgstr "нов �ървър"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Свързване на контакти"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Раздел�не…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Раздроб�ване на �ъбирателни� контакт на �ъдържаните в него контакти."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Свързване"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Да �е раздели ли �ъбирателни�т контакт „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Сигурни ли �те, че и�кате да раздробите този �ъбирателен контакт? Дей�твието "
-"ще раздели отделните контакти, които го �ъ�тавл�ват."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Раздел�не"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "И�тори�"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показване"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Тър�ене"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор � %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%e %B %Y, %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунди"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s минута"
 msgstr[1] "%s минути"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Разговорът продължи %s, приключи в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Дне�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "По в��ко време"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "В�еки"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Кой"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Кога"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "В�ичко"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Тек�тови разговори"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Разговори"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Вход�щи повиквани�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Изход�щи повиквани�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропу�нати повиквани�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Какво"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Сигурни ли �те, че и�кате да изтриете хронологи�та?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Изчи�тване"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Изтриване от:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Зареждане…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "Р_едактиране"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Изтриване на и�тори�та…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профил"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Р_едактиране"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�тр. 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Идентификатор:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Зареждане…</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:77
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "Избрани�т контакт е извън лини�"
+msgstr "Контактът е извън лини�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:79
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "Избрани�т контакт е неправилен"
+msgstr "Избрани�т контакт е неправилен или непознат"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
-msgstr "В този разговор не �е поддържа тема"
+msgstr "Контактът не поддържа този тип разговор"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
-msgstr ""
+msgstr "Тази функционално�т не �е поддържа от реализаци�та на протокола"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
-msgstr ""
+msgstr "�е може да �е започне разговор � този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:91
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
-msgstr ""
+msgstr "Забранено ви е да влизате в този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:93
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
-msgstr ""
+msgstr "Каналът е пълен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "Кан�т ви да �е при�ъедините към %s"
+msgstr "За да влезете в този канал, тр�бва да бъдете поканени"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "Контактът не е в мрежата"
+msgstr "Командата не може да �е изпълни, когато не �те �вързани"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "лип�ват права"
+msgstr "До�тъпът е отказан"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "Възникна грешка при започването на разговор."
+msgstr "Възникна грешка при започването на разговор"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:305
-msgid "C_hat"
-msgstr "_Разговор"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Въведете идентификатор на контакт или телефонен номер:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:324
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "�ов разговор"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Изпращане на _видео"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Видео разговор"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Разговор"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_�удио разговор"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "�ов разговор"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "�еу�пешно идентифициране за реги�траци�та <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2659,12 +2621,8 @@ msgstr "�ати�нете, за да направите това �ъ�то�н
 msgid "Set status"
 msgstr "Задаване на �ъ�то�ние"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Задайте при�ъ�твието и текущото �и �ъ�то�ние"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Други �ъобщени�…"
 
@@ -2672,7 +2630,7 @@ msgstr "Други �ъобщени�…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "�ова реги�траци� в %s"
@@ -2682,20 +2640,20 @@ msgid "Find:"
 msgstr "Тър�ене:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Зачита_не на главни/малки"
+msgid "_Previous"
+msgstr "_Предишен"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фразата не е открита"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Следващ"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Зачита_не на главни/малки"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Предишен"
+msgid "Phrase not found"
+msgstr "Фразата не е открита"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2741,12 +2699,12 @@ msgstr "�удио разговорът завърши"
 msgid "Edit Custom Messages"
 msgstr "Редактиране на други �ъобщени�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1044
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Редактирано в %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1749
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "�ормално"
 
@@ -2823,43 +2781,47 @@ msgid "Certificate hostname: %s"
 msgstr "Име на хо�т в �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продължаване"
+msgid "C_ontinue"
+msgstr "_Продължаване"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�едоверена връзка"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Връзката не е надеждна. Желаете ли да продължите въпреки това?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомн�не на избора за бъдещи връзки"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Информаци� за �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "�дре�ът не може да бъде отворен"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "�едо�татъчно �вободно м��то за запазване на файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"За запазването на файла �а необхоими %s, но �вободни �а едва %s. Изберете "
+"За запазването на файла �а необходими %s, но �вободни �а едва %s. Изберете "
 "друго ме�тоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щ файл от %s"
@@ -3031,31 +2993,31 @@ msgstr "западен"
 msgid "Vietnamese"
 msgstr "виетнам�ки"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Лип�ва �ъобщение за грешка"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Бързо �ъобщение (Empathy)"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Без автоматично �вързване при �тартиране"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Без показване на �пи�ъка � контакти и други прозорци при �тартиране"
 
-#: ../src/empathy.c:453
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy.c:640
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при �вързване � управлението на реги�трации"
 
-#: ../src/empathy.c:642
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3101,11 +3063,11 @@ msgstr ""
 "заедно � тази програма. �ко не �те, пишете до Free Software Foundation, "
 "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Програма за моментни �ъобщени� за GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Я�ен Праматаров <yasen@lindeas.com>\n"
@@ -3118,226 +3080,84 @@ msgstr ""
 "�аучете повече за на� на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Възникна грешка при вна��нето на реги�трации."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Възникна грешка при анализирането на данните на реги�траци�та."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Възникна грешка при �ъздаване на реги�траци�та."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Възникна грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Съобщението за грешка бе: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Може да �е върнете назад и да опитате да въведете данните за реги�траци�та "
-"наново или да излезете от този помощник и да добавите реги�трациите по-къ�но "
-"от менюто „Редактиране“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Възникна грешка"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Какъв вид реги�траци� имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Имате ли н�какви други реги�трации, които и�кате да на�троите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Въведете данните за реги�траци�та ви"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Какъв вид реги�траци� и�кате да �ъздадете?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "И�кате ли да �ъздадете друг вид реги�трации?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Въведете данните за новата реги�траци�"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Чрез Empathy може да разговар�те � хора от локалната ви мрежа, при�тели и "
-"колеги ползващи Google Talk, AIM, Windows Live и много други програми за "
-"разговор. С микрофон или уеб-камера може да провеждате и аудио/видео "
-"разговори."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Имате ли реги�траци�, ко�то �те ползвали � друга програма за разговори?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, да �е вне�ат данните за реги�траци�та ми от "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ще въведа данните за реги�траци�та ми �ега"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "�е, и�кам нова реги�траци�"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, за�ега и�кам про�то да виждам хората в локалната мрежа"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изберете реги�трациите за вна��не:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "�е, това е в�ичко за�ега"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy може автоматично да открива и хората, които �а �вързани в �ъщата "
-"мрежа като ва�, и да започва разговор � т�х. �ко и�кате да ползвате тази "
-"възможно�т, проверете дали на�тройките отдолу �а верни. Можете да ги "
-"промените по-къ�но, както и да изключите изц�ло тази възможно�т от прозореца "
-"„Реги�трации“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Редактиране→Реги�трации"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_�е, за�ега тази възможно�т да не �е включва"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"��ма да може да разговар�те � хората �вързани към локалната ви мрежа, защото "
-"пакетът telepathy-salut не е ин�талиран. За да включите тази възможно�т, "
-"ин�талирайте пакета и �ъздайте реги�траци� „Хора наблизо“ в прозореца за "
-"реги�трации."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Пакетът telepathy-salut не е ин�талиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Помощник за �ъобщени� и телефони� през Интернет"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добре дошли в Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Вна��не на �ъще�твуващи реги�трации"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Въведете още информаци�"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Има незапазени промени отно�но реги�траци�та ви в %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Реги�траци�та ви в�е още не е запазена."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1330
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Свързване…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Извън мрежата — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Изключен — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Извън мрежата — лип�ва връзка"
 
 # FIXME: термини за offine и disconnected
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "�еизве�тно �ъ�то�ние"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Тази реги�траци� използва �таро и неподдържано �дро, затова е изключена. "
+"Ин�талирайте пакета „telepathy-haze“ и ре�тартирайте програмата, за да "
+"мигрирате рeги�траци�та."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Извън мрежата — реги�траци�та е изключена"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"�а път �те да �ъздадете нова реги�траци�, което ще анулира\n"
-"промените ви. И�кате ли да продължите?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Редактиране на на�тройките на връзката"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Личните ви данни не могат да бъдат изтеглени от �ървъра."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Влезте в мрежата, за да редактирате личните �и данни."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Редактиране на на�тройките на връзката…"
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Сигурни ли �те, че и�кате да изтриете реги�траци�та „%s“?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Това н�ма да изтрие реги�траци�та ви от �ървъра."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3346,15 +3166,23 @@ msgstr ""
 "промените ви. И�кате ли да продължите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Включване"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Изключване"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Пре�качане"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Свързване"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3366,19 +3194,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Добав�не…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Зареждане на данните за контакта"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�е е ин�талиран протокол"
+msgid "_Import…"
+msgstr "_Вна��не…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Зареждане на данните за контакта"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3386,125 +3210,116 @@ msgstr ""
 "За да добавите нова реги�траци�, тр�бва да имате модул, който поддържа "
 "нейни� протокол."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Вна��не…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "�е �а ин�талирани модулите за поддръжка на този протокол"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — идентифициране � Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Идентифициране � Empathy"
 
-# FIXME: Това е връзка чрез mDNS/DNS-SD, �иреч Avahi.  „Хора наблизо“ е
-# до�та объркващо, защото контакти от локалната мрежа не е задължително
-# да �а наблизо, както и контакти от други мрежи може да �а �ъв�ем
-# наблизо.
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Хора наблизо"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " — телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Ярко�т"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
-msgstr "Гама корекци�"
+msgstr "Гама"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Сила на звука"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Странична лента"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
-msgstr "�удио вход"
+msgstr "Вход�щ звук"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
-msgstr "Видео вход"
+msgstr "Вход�що видео"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Циферблат"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
-msgstr "Подробно�ти"
+msgstr "Подробна информаци�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1939
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Ме�тен адре�, както �е вижда оттук"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Ме�тен адре�, както �е вижда от �ървър в Интернет"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�дре� на от�рещната �трана, както �е вижда оттам"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2189
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "�дре� на препредаващи� �ървър"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2191
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "�дре� на групата за разпръ�кване (multicast)"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
 #: ../src/empathy-streamed-media-window.c:1846
-#: ../src/empathy-streamed-media-window.c:1849
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
 msgctxt "codec"
 msgid "Unknown"
-msgstr "�еизве�тно"
+msgstr "�еизве�тен"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr "Връзка — %d:%02dm"
+msgstr "Връзка от %d:%02dм"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Техниче�ки данни"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2999
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3513,8 +3328,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от аудио форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3004
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3523,8 +3338,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от видео форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3010
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3533,29 +3348,29 @@ msgstr ""
 "�е може да �е о�ъще�тви връзка � %s, чи�то мрежа, веро�тно, не поддържа "
 "преки връзки."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Мрежова грешка"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за аудио форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за видео форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3566,262 +3381,311 @@ msgstr ""
 "\">докладвайте този проблем</a> и прикачете журналните файлове указани в "
 "прозореца „Изчи�тване на грешки“ от менюто „Помощ“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:3044
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Грешка в модула за разговори"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "До�тигнат е кра�т на потока"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:3087
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Потокът на аудио връзката не може да бъде о�ъще�твен"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:3097
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Потокът на видео връзката не може да бъде о�ъще�твен"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Звук"
+msgid "_Call"
+msgstr "_Разговор"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодиращ модул:"
+msgid "_Microphone"
+msgstr "_Микрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Спиране на камерата"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Циферблат"
+msgid "_Settings"
+msgstr "_�а�тройки"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодиращ модул:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Преглед"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Затвар�не"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Помо_щ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Затвар�не на текущи� разговор"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Ръковод�тво"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Ме�тен кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Изчи�тване на грешки"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Уголем�ване"
+msgid "Swap camera"
+msgstr "Разм�на на камерата"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Смал�ване"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Отдалечен кандидат:"
+msgid "Maximise me"
+msgstr "Уголем�ване"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Изпращане на аудио"
+msgid "Disable camera"
+msgstr "Спиране на камерата"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Изпращане на видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Затвар�не"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Циферблат"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Затвар�не на текущи� разговор"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видео разговор"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Провеждане на видео разговор"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Провеждане на аудио разговор"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Разм�на на камерата"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Превключване на пращането на аудио"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Превключване на пращането на видео"
+msgid "Show dialpad"
+msgstr "Циферблат"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2591 ../src/empathy-call-window.c:2592
-#: ../src/empathy-call-window.c:2593 ../src/empathy-call-window.c:2594
-msgid "Unknown"
-msgstr "�еизве�тно"
+msgid "Display the dialpad"
+msgstr "Циферблат"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Изпращане на видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видео разговор"
+msgid "Toggle video transmission"
+msgstr "Превключване на пращането на видео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Разговор"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Изпращане на аудио"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Ръковод�тво"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Превключване на пращането на аудио"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Изчи�тване на грешки"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодиращ модул:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Помо_щ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "�еизве�тно"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Декодиращ модул:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Микрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Отдалечен кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_�а�тройки"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Ме�тен кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Преглед"
+msgid "Audio"
+msgstr "Звук"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Да �е затвори ли този прозорец?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"�ко затворите този прозорец, ще напу�нете %s. ��ма да получавате други "
+"�ъобщени� докато не влезете отново."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"�ко затворите този прозорец, ще напу�нете �та�та. ��ма да получавате други "
+"�ъобщени� докато не влезете отново в не�."
+msgstr[1] ""
+"�ко затворите този прозорец, ще напу�нете %u �таи. ��ма да получавате други "
+"�ъобщени� докато не влезете отново в т�х."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Излизане от %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"��ма да получавате други �ъобщени� от тази �та�, докато не влезете отново в "
+"не�."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Затвар�не на прозореца"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Излизане от �та�та"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d непрочетено)"
 msgstr[1] "%s (%d непрочетени)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (и %u друго)"
 msgstr[1] "%s (и %u други)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d непрочетено от други)"
 msgstr[1] "%s (%d непрочетени от други)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d непрочетено от в�ички)"
 msgstr[1] "%s (%d непрочетени от в�ички)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Изпращане на %d �ъобщение"
 msgstr[1] "Изпращане на %d �ъобщени�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Пише �ъобщение."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Изчи�тване на прозореца"
+msgid "_Conversation"
+msgstr "_Разговор"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Контакт"
+msgid "C_lear"
+msgstr "_Изчи�тване на прозореца"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "_Вмъкване на емотикон"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Любима �та� за разговор"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Поканване на _уча�тник…"
+msgid "Notify for All Messages"
+msgstr "Изве�т�ване за в�ички �ъобщени�"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Преме�тване на подпрозореца на_л�во"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Показване на �пи�ъка � контакти"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Преме�тване на подпрозореца на_д��но"
+msgid "Invite _Participant…"
+msgstr "Поканване на _уча�тник…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Изве�т�ване за в�ички �ъобщени�"
+msgid "C_ontact"
+msgstr "_Контакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Разговор"
+msgid "_Tabs"
+msgstr "_Подпрозорци"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Отдел�не на подпрозореца"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Любима �та� за разговор"
+msgid "_Previous Tab"
+msgstr "_Предишен подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Следващ подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Предишен подпрозорец"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Отм�на на затвар�нето на подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Показване на �пи�ъка � контакти"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Преме�тване на подпрозореца на_л�во"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Подпрозорци"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Преме�тване на подпрозореца на_д��но"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Отм�на на затвар�нето на подпрозорец"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Отдел�не на подпрозореца"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3835,100 +3699,100 @@ msgstr "Ста�"
 msgid "Auto-Connect"
 msgstr "�втоматично �вързване"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Управление на �таите в отметките"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Вход�щ видео разговор"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Вход�щ разговор"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ви тър�и � видео, и�кате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ви тър�и, и�кате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щ разговор от %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "От_казване"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Отговар�не"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Отговор � видео"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1569
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щ видео разговор от %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Покана за �та�"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "Покана за при�ъедин�ване към %s"
+msgstr "Покана за влизане в %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s ви кани да �е при�ъедините към %s"
+msgstr "%s ви кани да влезете в %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Отказване"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
-msgstr "_При�ъедин�ване"
+msgstr "_Влизане"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s ви кани да �е при�ъедините към %s"
+msgstr "%s ви кани да �е влезете в %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "Кан�т ви да �е при�ъедините към %s"
+msgstr "Кан�т ви да влезете в %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вход�щ файл от %s"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Парола"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s и�ка разрешение да вижда дали �те в мрежата"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3938,105 +3802,105 @@ msgstr ""
 "Съобщение: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u ч., %02u м. и %02u �ек."
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u м. и %02u �ек."
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s от общо %s, � %s/�ек."
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s от общо %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Получаване на файла „%s“ от %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Изпращане на файла „%s“ до %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при получаване на „%s“ от %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при получаване на файл"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при изпращане на „%s“ до %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при изпращане на файл"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ получен от %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ изпратен до %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Прехвърл�нето на файл завърши"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Изчакване на отговора на други� уча�тник"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверка на цело�тта на „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Изчи�л�ване на извадката на „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "О�тават"
 
@@ -4050,7 +3914,11 @@ msgstr ""
 "Изчи�тване на завършените, отменените и неу�пешните прехвърл�ни� на файлове "
 "от �пи�ъка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Вна��не"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4058,168 +3926,188 @@ msgstr ""
 "�е �а открити реги�трации за вна��не. Empathy поддържа в момента вна��не "
 "�амо от Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Вна��не на реги�трации"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Вна��не"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Източник"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Паролата ви"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Прекъ�ване"
 
-#: ../src/empathy-main-window.c:642
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+"Тр�бва да на�троите поне една реги�трации, за да �е по�в�т контакти тук."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�е е намерено �ъвпадение"
 
-#: ../src/empathy-main-window.c:750
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
+"Реги�трациите за %s н�ма да могат да �е ползват, преди да обновите �офтуера "
+"за %s."
 
-#: ../src/empathy-main-window.c:818
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
-msgstr ""
+msgstr "Обнов�ване на �офтуера…"
 
-#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Затвар�не"
 
-#: ../src/empathy-main-window.c:937
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�ово �вързване"
 
-#: ../src/empathy-main-window.c:943
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Редактиране на реги�траци�"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1088
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Захранване на %s (%s)…"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Захранване на кредита"
 
 #. top up button
-#: ../src/empathy-main-window.c:1206
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Захранване…"
 
-#: ../src/empathy-main-window.c:1949
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:2324
-msgid "Contact List"
-msgstr "Спи�ък � контакти"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Контакти на карта"
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Кредит"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Тр�бва да включите поне една от реги�трациите �и, за да �е по�в�т контакти "
+"тук."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Тър�ене в �пи�ъка � контакти"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Тр�бва да включите %s, за да �е по�в�т контакти тук."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Добав�не към отметките"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "Спи�ък � контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Редактиране на отметките"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�а�тройки на реги�трациите"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_�ормален размер"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ов разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "�ов _разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "�ормален размер � _аватари"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Тър�ене на контакти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_�а�тройки"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Прехвърл�ни� на файлове"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Изключени контакти"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "_Показване на протокола"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Подреждане по _име"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Кредит"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Подреждане по _�ъ�то�ние"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Контакти на карта"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Реги�трации"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Блокирани контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Стегнат режим"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_�а�тройки"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Прехвърл�ни� на файлове"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Тър�ене в �пи�ъка � контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_При�ъедин�ване…"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Подреждане по _име"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_�ов разговор…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Подреждане по _�ъ�то�ние"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Изключени контакти"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "�ормален размер � _аватари"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Лични данни"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_�ормален размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Стегнат режим"
+
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Ста�"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Тър�ене на контакти…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Влизане…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Добав�не към отметките"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Редактиране на отметките"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4231,7 +4119,7 @@ msgstr "Уча�тници"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4244,25 +4132,30 @@ msgstr ""
 "Изи�ква �е парола: %s\n"
 "Брой уча�тници: %s"
 
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
 # �алага �е � главни букви, защото „да“ �е използва в помощника за нови
 # реги�трации, където има и отговори под формата на пълни изречени� като
 # „�е, това е в�ичко за�ега“.
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Избро�ването на �таите не може да започне"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Избро�ването на �таите не може да �пре"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Спи�ъкът �ъ� �таи не може да бъде зареден"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Влизане в �та�"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4272,6 +4165,10 @@ msgstr ""
 "�таи от �пи�ъка."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Ста�:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4279,180 +4176,196 @@ msgstr ""
 "Попълнете �ървъра, на който е �та�та. �ко т� е на �ървъра на текущата "
 "реги�траци�, о�тавете полето празно."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Влизане в �та�"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Спи�ъкът �ъ� �таи не може да бъде зареден"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ък �ъ� �таи"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Ста�:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Съобщението е получено"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "�ов разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Контактът е в мрежата"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Контактът влезе в мрежата"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Контактът е извън мрежата"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Реги�траци�та е включена"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Реги�траци�та е изключена"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Език"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Жулиета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео! О, защо �и ти Ромео?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "От род и име отречи �е или"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ако не щеш, любовна клетва дай ми"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "и аз не ще �ъм вече Капулети!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Да � отвърна ли или да �лушам?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Жулиета прекъ�на връзката"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�а�тройки"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Използване на _картинки за емотикони"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Показване на контактите в �таите"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведение"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Започване на разговорите в: "
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема за прозорците за разговори:"
+msgid "new ta_bs"
+msgstr "нови по_дпрозорци"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Без _изве�т�ване в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
+msgid "new _windows"
+msgstr "нови _прозорци"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Без _звуци в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показване на вход�щи �ъбити� в обла�тта за уведом�ване"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�втоматично �вързване при �тартиране"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Премахването на ехото може да изчи�ти гла�а ви за от�рещната �трана, но при "
-"н�кои компютри �ъздава проблеми. �ко н�кой от �ъбе�едниците �е оплаче, че "
-"чува �транни шумове или прекъ�вани� по време на разговора, изключете "
-"премахването на ехото и проведете наново разговор."
+msgid "Log conversations"
+msgstr "�рхив на разговорите"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Изве�т�ване, когато контактът влезе в мрежата"
+msgid "Behavior"
+msgstr "Поведение"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Изве�т�ване, когато контактът излезе извън мрежата"
+msgid "General"
+msgstr "Общи"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Изве�т�ване, когато прозорецът за разговори не е на _фоку�"
+msgid "_Enable bubble notifications"
+msgstr "Включване на изве�т�ването � _прозорци"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Езици � проверка на правопи�а:"
+msgid "Disable notifications when _away or busy"
+msgstr "Без _изве�т�ване в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Общи"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Изве�т�ване, когато прозорецът за разговори не е на _фоку�"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "�иво на вход�щи� звук:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Изве�т�ване, когато контактът влезе в мрежата"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Сила на вход�щи� звук:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Изве�т�ване, когато контактът излезе извън мрежата"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Изве�т�ване"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Датчик за ме�тоположение:"
+msgid "_Enable sound notifications"
+msgstr "Включване на уведом�ването �ъ� _звук"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "�рхив на разговорите"
+msgid "Disable sounds when _away or busy"
+msgstr "Без _звуци в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Изве�т�ване"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Звуци при �ъбити�"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Звуци"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Лични данни"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Премахване на _ехото за по-добро каче�тво"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Премахването на ехото може да изчи�ти гла�а ви за от�рещната �трана, но при "
+"н�кои компютри �ъздава проблеми. �ко н�кой от �ъбе�едниците �е оплаче, че "
+"чува �транни шумове или прекъ�вани� по време на разговора, изключете "
+"премахването на ехото и проведете наново разговор."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Публикуване на ме�тоположението ви към контактите ви"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
@@ -4461,198 +4374,201 @@ msgstr ""
 "точни данни от град, щат, държава. Координатите от GPS ще �а точни до едно "
 "м��то зад де�етичната запета�."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Използване на _картинки за емотикони"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Показване на контактите в �таите"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Звуци"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Проверка на правопи�а"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "В �пи�ъка �а �амо езиците, за които е ин�талиран речник."
-
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Графични теми"
+msgid "_Reduce location accuracy"
+msgstr "_�и�ка точно�т на ме�тоположението"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Премахване на _ехото за по-добро каче�тво"
+msgid "Privacy"
+msgstr "Лични данни"
 
-# Това е пеленг.  По�ока е неточно, защото не е релативно �пр�мо
-# дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
-# терминологично в �ферата на мор�ката/въздушната навигаци�.
-# Пеленг �тава
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Пеленг:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_�втоматично �вързване при �тартиране"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Мобилен телефон"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "Включване на изве�т�ването � _прозорци"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "Включване на уведом�ването �ъ� _звук"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Датчик за ме�тоположение:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "В �пи�ъка �а �амо езиците, за които е ин�талиран речник."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Езици � проверка на правопи�а:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Отвар�не на разговорите в отделни прозорци"
+msgid "Spell Checking"
+msgstr "Проверка на правопи�а"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Публикуване на ме�тоположението ви към контактите ви"
+msgid "Chat Th_eme:"
+msgstr "_Тема за прозорците за разговори:"
+
+# Това е пеленг.  По�ока е неточно, защото не е релативно �пр�мо
+# дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
+# терминологично в �ферата на мор�ката/въздушната навигаци�.
+# Пеленг �тава
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Пеленг:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "_�и�ка точно�т на ме�тоположението"
+msgid "Themes"
+msgstr "Графични теми"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Съ�то�ние"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "�ов разговор � контакта"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Включване на камерата"
+msgid "Redial"
+msgstr "Преизбиране"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Изключване на камерата"
+msgid "V_ideo"
+msgstr "_Видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Без видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Изключване на камерата и пращането на видео"
+msgid "Video Preview"
+msgstr "Преглед на видеото"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включване на камерата и пращането на видео"
+msgid "Video On"
+msgstr "С видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включване на камерата без пращане на видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Пренабиране на контакта"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+msgid "Camera Off"
+msgstr "Изключване на камерата"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набиране"
+msgid "Disable camera and stop sending video"
+msgstr "Изключване на камерата и �пиране на изпращането на видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Видео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Изключване на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Включване на камерата без изпращане на видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Включване на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Включване на камерата"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Включване на камерата и изпращане на видео"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Карта � контактите"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Запазване"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Връзка към �айта за по�тав�не"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Отговор на �айта за по�тав�не"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Данните �а прекалено големи за еднократно по�тав�не. Запазете журнала във "
+"файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Прозорец за изчи�тване на грешки"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Изпращане към �айта за по�тав�не"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Подробно�т"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информаци�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Обла�т"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категори�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4660,173 +4576,178 @@ msgstr ""
 "Избраната програма за управление на връзките не поддържа разширението за "
 "отдалечено изчи�тване на грешки."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Поканване на уча�тник"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Избор на контакт, за поканване в разговора:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Покана"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Без показването на прозорци. Извършване на дейно�т (напр. вна��не) и �пиране"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Да не �е показват прозорци, о�вен ако в�ичките реги�трации �а за „Хора "
 "наблизо“"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Първоначално избиране на дадена реги�траци� (напр. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ид-р на реги�траци�>"
 
-#: ../src/empathy-accounts.c:197
-#, fuzzy
-msgid "Show account assistant"
-msgstr "Показване на кредита в �пи�ъка � контакти"
-
-#: ../src/empathy-accounts.c:203
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Реги�трации на Empathy"
 
-#: ../src/empathy-accounts.c:242
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Реги�трации на Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Само избрана у�луга"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— изчи�тване на грешки към Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Изчи�тване на грешки към Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Отговар�не"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Отхвърл�не"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1574
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Отговор"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Отговор � видео"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Отклон�ване"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Приемане"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Въвеждане"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s току-що �е опита да ви позвъни, но провеждахте друг разговор."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "инф."
 
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Задържане"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Без звук"
 
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Времетраене"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2898
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dм"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "Зачита_не на главни/малки"
-
-#~ msgid "Empathy has migrated butterfly logs"
-#~ msgstr "Empathy извърши миграци� на данните от butterfly"
-
-#~ msgid "Whether Empathy has migrated butterfly logs."
-#~ msgstr ""
-#~ "Дали програмата Empathy е извършила миграци� на данните от butterfly"
-
-#~ msgid "Ungrouped"
-#~ msgstr "Без група"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Текущи�т ви балан� е %s."
 
-#~ msgid "Favorite People"
-#~ msgstr "Любими хора"
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "��мате до�татъчно кредит, за да извършите това обаждане."
 
-#~ msgid "Select a contact"
-#~ msgstr "Избор на контакт"
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Захранване"
 
-#~ msgid "The selected contact cannot receive files."
-#~ msgstr "Избрани�т контакт не може да получава файлове."
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Зачита_не на главни/малки"
 
-#~ msgid "The selected contact is offline."
-#~ msgstr "Избрани�т контакт е извън мрежата"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Какъв вид реги�траци� имате?"
 
-#~ msgctxt "encoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "�ова реги�траци�"
 
-#~ msgctxt "encoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+# FIXME: Това е връзка чрез mDNS/DNS-SD, �иреч Avahi.  „Хора наблизо“ е
+# до�та объркващо, защото контакти от локалната мрежа не е задължително
+# да �а наблизо, както и контакти от други мрежи може да �а �ъв�ем
+# наблизо.
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Хора наблизо"
 
-#~ msgctxt "decoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy може автоматично да открива и хората, които �а �вързани в �ъщата "
+"мрежа като ва�, и да започва разговор � т�х. �ко и�кате да ползвате тази "
+"възможно�т, проверете дали на�тройките отдолу �а верни."
 
-#~ msgctxt "decoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Можете да промените тези на�тройки по-къ�но или изц�ло да изключите тези "
+"възможно�т като изберете <span style=\"italic\">Редактиране → Реги�трации</"
+"span> в �пи�ъка � контакти."
diff --git a/po/da.po b/po/da.po
index 8bbb23479..2c2f5d578 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # Ole Laursen <olau@hardworking.dk>, 2003, 04, 06.
 # David Nielsen <dnielsen@breakmygentoo.net>, 2002, 06.
 # M.P. Rommedahl <lhademmor@gmail.com>, 2008.
-# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2011.
+# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2012.
 # Ask Hjorth Larsen <asklarsen@gmail.com>, 2010.
 #
 # Konventioner:
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-16 13:32+0200\n"
-"PO-Revision-Date: 2011-09-16 13:41+0200\n"
+"POT-Creation-Date: 2012-02-20 22:56+0100\n"
+"PO-Revision-Date: 2012-02-19 19:32+0100\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -53,27 +53,29 @@ msgstr "Samtaleklienten Empathy"
 msgid "IM Client"
 msgstr "IM-Klient"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Håndtér konti for meddelelser og VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Konti for meddelelser og VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Ã…bn altid et separat chatvindue til nye chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Opkaldslydstyrke"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Opkaldslydstyrke, som en procentdel."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Kameraenhed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Kameraposition"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -81,55 +83,61 @@ msgstr ""
 "Tegn som skal tilføjes efter kaldenavn når du bliver navnefuldførelse (tab) "
 "i gruppechat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Tema for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Temavariant for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaadskilt liste af sprog, der skal bruges ved stavekontrol (f.eks. \"en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Forbindelseshåndteringer bør bruges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterium for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"D-Bus-objektstien til den sidste konto, som blev valgt til at tilslutte et "
+"rum."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Standardkameraenheden som skal bruges ved videoopkald, f.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Standardmappe at vælge profilbillede fra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Deaktivér pop op-påmindelse ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Deaktivér lyde ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Deaktiver indkommende begivenheder i statusområde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -138,71 +146,75 @@ msgstr ""
 "brugeren med det samme hvis den er sat til falsk."
 
 # Der er en streng et andet sted som afslører at det er lydekko der menes
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Understøttelse for neutralisering af ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy må offentliggøre brugerens placering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy må bruge GPS'en til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy må bruge mobilnetværket til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy må bruge netværket til at gætte placeringen"
 
 # Lidt klodset for at undgå at bruge download
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Standardmappe til hentede filer i Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy har konverteret butterfly-logge"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy skal automatisk sættes til fraværende ved inaktivitet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy skal autoforbinde ved start"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal reducere placeringens nøjagtighed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy skal bruge kontaktens profilbillede som chattens vinduesikon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå WebKit-udviklingsværktøjer til"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivér pop op-påmindelser for nye beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Aktivér stavekontrol"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Skjul hovedvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informér andre brugere om at du er ved at skrive til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "Sidste konto som blev valgt i \"tilslut rum\"-dialogen"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Navnefuldførelsestegn"
@@ -272,87 +284,87 @@ msgid "Show avatars"
 msgstr "Vis profilbilleder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Vis fif om lukning af hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Vis offline kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Stavekontrolleringssprog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Den forvalgte mappe at gemme filoverførsler i."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den seneste mappe som et profilbillede blev valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Positionen af chatvinduets sidepanel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Den gemte positionen (i billedpunkter) af chatvinduets sidepanel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Den temavariant der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Benyt grafiske tekstansigter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Benyt påmindelseslyde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Brug tema til chatrum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Hvorvidt Empathy har lov til at offentliggøre brugerens placering overfor "
 "kontakterne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Hvorvidt Empathy har lov til at bruge GPS til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge mobilnetværket til at gætte "
 "placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge netværket til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Om Empathy har konverteret butterfly-logge."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Om Empathy automatisk skal logge ind på dine konti ved opstart."
@@ -452,14 +464,22 @@ msgstr ""
 "travlt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Hvorvidt tilstandene \"skriver\" eller \"på pause\" skal sendes. Påvirker på "
+"nuværende tidspunkt ikke \"ikke til stede\"-tilstanden."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger af."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -467,46 +487,50 @@ msgstr ""
 "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked, selv "
 "hvis chatten allerede er åben, men ikke er fokuseret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Hvorvidt der skal vises kontosaldi i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter der ikke er tilsluttet, skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Hvorvidt der skal vises grupper i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Om der skal vises pop op-påmindelser, når brugeren er fraværende eller har "
 "travlt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Hvorvidt kontaktlisten skal vises i chatrum."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt form eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -514,43 +538,61 @@ msgstr ""
 "Om beskeddialogen om at lukke hovedvinduet med \"x\"-knappen i titelbjælken "
 "skal vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om temaet skal bruges til chatrum eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Kriteriet der bruges til at sortere kontaktlisten. Som standard sorteres "
-"efter kontaktens navn med værdien \"name\". Værdien \"state\" vil sortere "
-"kontaktlisten efter status."
+"efter kontaktens status med værdien \"state\". Er værdien \"name\", sorteres "
+"efter kontaktens navn."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Håndtér konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ingen årsag blev angivet"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Ændringen i tilstand foregik på anmodning"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Du annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Den anden deltager annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Fejl ved forsøg på overførsel af filen"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Den anden deltager er ikke i stand til at overføre filen"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Ukendt årsag"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverførsel fuldført, men filen blev beskadiget"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverførsel understøttes ikke af fjernkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Den valgte fil er ikke en regulær fil"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Den valgte fil er tom"
 
@@ -570,173 +612,142 @@ msgstr "Ringede til %s"
 msgid "Call from %s"
 msgstr "Opkald fra %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Sokkeltype understøttet ikke"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Ingen årsag blev angivet"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Ændringen i tilstand foregik på anmodning"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Du annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Den anden deltager annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Fejl ved forsøg på overførsel af filen"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Den anden deltager er ikke i stand til at overføre filen"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Ukendt årsag"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Optaget"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ikke til stede"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status sat til offline"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Netværksfejl"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfejl"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i brug"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certifikat ikke givet"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikat udløbet"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certifikat ikke aktiveret"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certifikat-værtsnavn passer ikke"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikat-fingeraftryk passer ikke"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certifikat selv-underskrevet"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfejl"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgængelig"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet er ugyldigt"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilslutningen er blevet afvist"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Forbindelsen kunne ikke etableres"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Forbindelsen blev brudt"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Denne ressource er allerede forbundet til serveren"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne konto er allerede forbundet til serveren"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Forbindelse er blevet erstattet af en ny forbindelse, der bruger samme "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen findes allerede på serveren"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Serveren har på nuværende tidspunkt for travlt til at håndtere forbindelsen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet er blevet tilbagekaldt"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikatet bruger en usikker krypteringsalgoritme eller er kryptografisk "
 "svag"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -744,165 +755,145 @@ msgstr ""
 "Længden af servercertifikatet, eller dybden af servercertifikatkæden, "
 "overskrider krypteringsbibliotekets grænser"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+# brugen af "software" fjernet behovet for at finde ud af om der henvises til et eller flere programmer
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Din software er for gammel"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern fejl"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Folk i nærheden"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle Konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Mine Webkonti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Kontoen %s redigeres via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontoen %s kan ikke redigeres i Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Start Mine Webkonti"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Redigér %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "An_vend"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_og ind"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne konto findes allerede på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Opret en ny konto på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Annuller"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -950,7 +941,7 @@ msgstr "Husk adgangskode"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
@@ -1280,7 +1271,7 @@ msgid "STUN Server:"
 msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1324,36 +1315,36 @@ msgstr "Yahoo!-i_d:"
 msgid "_Room List locale:"
 msgstr "_Rumliste-placering:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen af de accepterede billedformater understøttes på dit system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke gemme billede til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Vælg dit profilbillede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tag et billede..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Intet billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Billeder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -1362,7 +1353,7 @@ msgid "Click to enlarge"
 msgstr "Klik for at forstørre"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
 msgstr "Der opstod en fejl ved opstart af opkaldet"
 
@@ -1382,40 +1373,44 @@ msgstr "Den angivne kontakt er ikke gyldig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødopkald er ikke understøttet med denne protokol"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "Din saldo rækker ikke til at du kan foretage dette opkald"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Kunne ikke åbne privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Emne understøttes ikke af denne samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke adgang til at ændre emnet"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� er ikke et gyldigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Ryd alle meddelelser fra den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: Angiv emnet for den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1423,23 +1418,23 @@ msgstr ""
 "/part [<id for chatrum>] [<grund>]: Forlad chatrummet, som standard det "
 "nuværende chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontact-id> [<meddelelse>]: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-id> <meddelelse>: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kaldenavn>: Ændr dit kaldenavn på den aktuelle server"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelelse>: Send en handlingsmeddelelse til den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1449,11 +1444,11 @@ msgstr ""
 "til at sende en meddelelse, der begynder med \"/\". For eksempel: \"/say /"
 "join-kommandoen bruges til at gå ind i et nyt chatrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: viser information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1461,113 +1456,126 @@ msgstr ""
 "/help [<kommando>]: Vis alle understøttede kommandoer. Hvis <kommando> er "
 "angivet, så vis dens brugsdokumentation."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Brug: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukendt kommando; brug /help for at se de tilgængelige kommandoer"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "for lille saldo til at sende beskeden"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Fejl under afsendelse af besked \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Fejl under afsendelse af besked: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "utilstrækkelig saldo til at sende besked. <a href='%s'>Fyld op</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ude af stand til"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "adgang nægtet"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "for lang besked"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ikke implementeret"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Fejl under afsendelse af besked \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Fejl under afsendelse af besked: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne sat til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne sat af %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Intet emne defineret"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tilføj \"%s\" til ordbog"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tilføj \"%s\" til ordbogen for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Indsæt tekstansigt"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Kunne ikke hente seneste logge"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s er koblet af"
@@ -1575,12 +1583,12 @@ msgstr "%s er koblet af"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s blev sparket ud af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s blev sparket ud"
@@ -1588,17 +1596,17 @@ msgstr "%s blev sparket ud"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bortvist af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bortvist"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forladt rummet"
@@ -1608,17 +1616,17 @@ msgstr "%s har forladt rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s er kommet ind i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har nu navnet %s"
@@ -1626,88 +1634,88 @@ msgstr "%s har nu navnet %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ønsker du at gemme denne adgangskode?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ikke nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Forkert adgangskode; prøv venligst igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Dette rum beskyttes af en adgangskode:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Deltag"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ukendt eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokering af kontakter er midlertidigt ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokering af kontakter er ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Adgang nægtet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Kunne ikke blokere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redigér blokerede kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1719,64 +1727,55 @@ msgstr "Blokerede kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Fjern"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiér linkadresse"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ã…bn link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redigér kontaktoplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personlige oplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Er du sikker på at du ønsker at blokere \"%s\", så vedkommende ikke kan "
 "kontakte dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokér"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Indrapportér denne kontakt som værende grov"
@@ -1794,349 +1793,268 @@ msgstr "Abonneringsanmodning"
 msgid "_Block User"
 msgstr "_Blokér bruger"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ikke grupperet"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favoritfolk"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ønsker du at fjerne gruppen \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Fjerner gruppe"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Fjern"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ønsker du at fjerne kontakten \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Fjerner kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Tilføj kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokér kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Lydopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videoopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Tidligere samtaler"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send fil"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Del mit skrivebord"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favorit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Opl_ysninger"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviterer dig til dette rum"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Invitér til chatrum"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Søg i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Søg: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Tilføj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ingen kontakter fundet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Besked til introduktion af dig selv:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Lad mig venligst se hvornår du er online. Tak!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Vælg en kontakt"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Fulde navn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnummer:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail-adresse:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webside:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Sidst set:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Tilsluttet fra:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Fraværsbesked:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Lands ISO-kode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Gade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Etage:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Niveau for nøjagtighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Fejl:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Lodret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vandret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Kurs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Stigningshastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Sidst opdateret den:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Længdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Højde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Placering"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %B, %Y klokken %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gem profilbillede"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Kan ikke gemme profilbillede"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Detaljer om kontakt"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Fulde navn"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail-adresse"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webside"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Sidst set:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Tilsluttet fra:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Fraværsbesked:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "arbejde"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hjemme"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "taleopkald"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "foretrukne"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "post"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pakke"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Placering</b> den (dato)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2148,15 +2066,10 @@ msgstr "Klientoplysninger"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detaljer om kontakt"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -2173,11 +2086,11 @@ msgstr "Styresystem:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2185,105 +2098,171 @@ msgstr ""
 "Vælg de grupper, som du ønsker at denne skal fremgå i. Bemærk at du kan "
 "vælge mere end en gruppe eller slet ingen gruppe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Tilf_øj gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vælg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil blive blokeret:"
 msgstr[1] "Følgende identiteter vil blive blokeret:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokeres:"
 msgstr[1] "Følgende identiteter kan ikke blokeres:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Sammenkædede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Vælg kontakter som skal sammenkædes"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Forhåndsvisning af ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redigér kontaktoplysninger"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Vælg konto der skal bruges til at lave dette opkald"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HJEM"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokér kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Lydopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Tidligere samtaler"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send fil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Del mit skrivebord"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installeret"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Installér venligst gnome-contacts for at kunne tilgå detaljer for kontakt."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Opl_ysninger"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redigér"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Sammenkæd kontakter…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviterer dig til dette rum"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invitér til chatrum"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Tilføj kontakt…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Slet og _blokér"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ønsker du at fjerne gruppen \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Fjerner gruppe"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Fjern"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ønsker du at fjerne kontakten \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2292,7 +2271,11 @@ msgstr ""
 "Ønsker du virklig at fjerne denne sammenkædede kontakt \"%s\"? Bemærk at "
 "dette vil fjerne alle de kontakter, som denne sammenkædede kontakt består af."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Fjerner kontakt"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2307,19 +2290,19 @@ msgstr "<b>Placering</b> den (dato)"
 msgid "Online from a phone or mobile device"
 msgstr "Via nettet fra en telefon eller mobil enhed"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nyt netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Vælg et IRC-netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Nulstil _netværksliste"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Vælg"
@@ -2332,182 +2315,136 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Sammenkæd kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Adskil…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
-"indeholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Sammenkæd"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Adskil sammenkædet kontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette vil "
-"splitte de sammenkædede kontakter fuldstændigt op i de kontakter de består "
-"af."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Adskil"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Søg"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minut"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Opkaldet tog %s, sluttede %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "NÃ¥r som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Hvornår"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Hvad som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Tekstchat"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Indkommende opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Udgående opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Mistede opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Hvad"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Er du sikker på at du ønsker at slette alle logge fra tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Ryd alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Slet fra:"
 
@@ -2536,7 +2473,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Redigér"
 
@@ -2548,36 +2485,83 @@ msgstr "_Fil"
 msgid "page 2"
 msgstr "side 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-id:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakten er offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Den angivne kontakt er enten ugyldig eller ukendt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakten understøtter ikke denne form for samtale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+"Den forespurgte funktionalitet er ikke implementeret for denne protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Kunne ikke starte en samtale med den givne kontakt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Du er bortvist fra denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanalen er fuld"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Du skal inviteres, før du kan deltage i denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Kan ikke fortsætte i afkoblet tilstand"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Adgang nægtet"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Der opstod en fejl ved opstart af samtalen"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Indtast identifikator for kontakt eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Ny samtale"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Videoopkald"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Opkald"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Lydopkald"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nyt opkald"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Godkendelse mislykkedes for kontoen <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2614,12 +2598,8 @@ msgstr "Klik for at gøre denne status til en favorit"
 msgid "Set status"
 msgstr "Sæt status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Sæt din tilstedeværelse og status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Tilpassede beskeder…"
 
@@ -2696,12 +2676,12 @@ msgstr "Stemmeopkald sluttede"
 msgid "Edit Custom Messages"
 msgstr "Redigér tilpasset besked"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Besked redigeret %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2779,34 +2759,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certifikat-værtsnavn: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsæt"
+msgid "C_ontinue"
+msgstr "F_ortsæt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Ikke-betroet forbindelse"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Forbindelsen er ikke betroet. Vil du fortsætte alligevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valg til fremtidige forbindelser"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Kan ikke åbne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok fri plads til at gemme filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2815,7 +2799,7 @@ msgstr ""
 "%s fri plads er nødvendig for at gemme denne fil, men der er kun %s "
 "tilgængelig. Vælg venligst en anden placering."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Indkommende fil fra %s"
@@ -2987,39 +2971,31 @@ msgstr "Vestligt"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Den valgte kontakt kan ikke modtage filer."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Den valgte kontakt er offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ingen fejlmeddelelse"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Chatbesked (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Tilslut ikke ved start"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Vis ikke kontaktlisten eller nogen andre dialoger ved opstart"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM-klient"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Fejl ved forsøg på at kontakte kontohåndteringen"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3066,11 +3042,11 @@ msgstr ""
 "program. Hvis ikke, så skriv til Free software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "En samtaleklient til GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Ole Laursen\n"
@@ -3081,223 +3057,73 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Der opstod en fejl ved import af kontiene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Der opstod en fejl under oprettelse af kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Der opstod en fejl."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Fejlmeddelelsen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
-"eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Der opstod en fejl"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type chatkonto ønsker du?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du andre chatkonti, du vil have indstillet?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Indtast dine kontodetaljer"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type konto ønsker du at oprette?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Ønsker du at oprette andre chatkonti?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Indtast detaljerne for den nye konto"
-
-# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger som "
-"bruger Google Talk, AIM, Windows Live eller mange andre chatprogrammer. Med "
-"en mikrofon eller et webkamera kan du også foretage lyd- eller videoopkald."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Ja, importér mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nej, jeg vil oprette en ny konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil videre"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Vælg de konti, du vil importere:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nej, det var alt - indtil videre"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
-"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
-"detaljerne herunder er korrekte. Du kan let ændre disse detaljer senere, "
-"eller deaktivere denne funktion i dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redigér->Konti"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
-"netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere denne "
-"funktion, så installér venligst pakken telepathy-salut og opret en \"Folk i "
-"nærheden\"-konto fra dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installeret"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meddelelser og VoIP-konti"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importér dine eksisterende konti"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Indtast venligst personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Der er ugemte ændringer til din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke blevet gemt endnu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Forbinder…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Ikke tilsluttet — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frakoblet — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Ikke tilsluttet — Ingen netværksforbindelse"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Ukendt årsag"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Ikke tilsluttet — Konto deaktiveret"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Du er ved at oprette en ny konto, hvilket vil kassere\n"
-"dine ændringer. Er du sikker på, at du vil fortsætte?"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "Redigér forbindelsesparametre"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Kunne ikke hente din personlige information fra serveren."
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "Gå på nettet for at redigere din personlige information."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Redigér forbindelsesparametre..."
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ønsker du at fjerne %s fra din computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på serveren."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3306,15 +3132,23 @@ msgstr ""
 "ændringer. Er du sikker på, at du vil fortsætte?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Deaktivér"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Spring over"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Tilslut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3331,14 +3165,10 @@ msgid "Loading account information"
 msgstr "Indlæser kontaktoplysninger"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ingen protokol installeret"
+msgid "No protocol backends installed"
+msgstr "Ingen protokolmoduler installeret"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3356,132 +3186,116 @@ msgstr ""
 #  _("Import"), cell,
 #  "active", COL_IMPORT,
 #  NULL); 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Importér…"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Audio/video-klienten Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Folk i nærheden"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Audio/video-klienten Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Lydstyrke"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sidepanel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Lydinput"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videoinput"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Opkaldspanel"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detaljer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Opkald til %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses af maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses af en server på internettet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen for modparten(peer), som den ses på den anden side"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen for en videresendelsesserver"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen for multicastgruppen"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Forbundet — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3489,8 +3303,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de lydformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3498,8 +3312,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de videoformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3508,29 +3322,29 @@ msgstr ""
 "Kan ikke oprette forbindelse til %s. En af jer er måske på et netværk, der "
 "ikke tillader direkte forbindelser."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Der opstod en fejl på netværket"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3541,23 +3355,23 @@ msgstr ""
 "a> venligst denne fejl og vedhæft logfiler fra fejlfindingsvinduet i menuen "
 "Hjælp."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Der opstod en fejl i opkaldsmotoren"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Afslutningen af strømmen blev nået"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan ikke oprette lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan ikke oprette videostrøm"
 
@@ -3648,8 +3462,8 @@ msgstr "Slå videotransmission til/fra"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -3667,17 +3481,17 @@ msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Indhold"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Fejlfind"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Hjælp"
 
@@ -3690,51 +3504,100 @@ msgid "_Settings"
 msgstr "_Indstillinger"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Luk dette vindue?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Lukkes dette vindue, vil du forlade %s. Du vil ikke modtage yderligere "
+"beskeder, før du igen deltager."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Lukkes dette vindue vil du forlade et chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+msgstr[1] ""
+"Lukkes dette vindue vil du forlade %u chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlad %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke modtage yderligere beskeder fra dette chatrum, før du igen "
+"deltager i det."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Luk vindue"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlad rum"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulæst)"
 msgstr[1] "%s (%d ulæste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u anden)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulæst fra andre)"
 msgstr[1] "%s (%d ulæste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulæst fra alle)"
 msgstr[1] "%s (%d ulæste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d besked"
 msgstr[1] "Sender %d beskeder"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en besked."
 
@@ -3814,96 +3677,96 @@ msgstr "Auto-tilslut"
 msgid "Manage Favorite Rooms"
 msgstr "Håndtér yndlingsrum"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Indkommende videoopkald"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Indkommende opkald"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s foretager et videoopkald til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Indkommende opkald fra %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "Af_vis"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Besvar"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Besvar med video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Indkommende videoopkald fra %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Ruminvitation"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer dig til at slutte dig til %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Afslå"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Deltag"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterer dig til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du er blevet inviteret til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Indkommende filoverførsel fra %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Adgangskode påkrævet"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker tilladelse til at se, når du er på nettet"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3913,105 +3776,105 @@ msgstr ""
 "Besked: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s af %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s af %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Modtager \"%s\" fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sender \"%s\" til %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fejl ved modtagelse af \"%s\" fra %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Fejl ved modtagelse af fil"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fejl ved afsendelse af \"%s\" til %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Fejl ved afsendelse af en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" modtaget fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sendt til %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Filoverførsel fuldført"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Venter på den anden deltagers svar"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrollerer integritet af \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Tilbage"
 
@@ -4024,7 +3887,21 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Fjern færdiggjorte, annullerede eller fejlslagne filoverførsler fra listen"
 
-#: ../src/empathy-import-dialog.c:84
+# Fejlrapport, (v) eller (s)
+#
+# Kode omkring streng antyder at det er verbum bydeform
+#
+#  /* Import column */
+#  cell = gtk_cell_renderer_toggle_new ();
+#  gtk_tree_view_insert_column_with_attributes (view, -1,
+#  _("Import"), cell,
+#  "active", COL_IMPORT,
+#  NULL); 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4032,7 +3909,7 @@ msgstr ""
 "Ingen konti kunne findes til import. Empathy understøtter på nuværende "
 "tidspunkt kun at importere konti fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importér konti"
 
@@ -4047,167 +3924,193 @@ msgstr "Importér konti"
 #  "active", COL_IMPORT,
 #  NULL); 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Giv adgangskode"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Frakobl"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du skal oprette en konto for at se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen træffere fundet"
 
-#: ../src/empathy-main-window.c:777
+# Kildekoden antyder at begge %s er protokoller
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Beklager, %s-konti kan ikke benyttes før din %s-software er blevet opdateret."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Updatér software..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Luk"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Tilslut igen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigér kontoen"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Luk"
-
 # Dette er vist ikke helt efter den engelske definition som er noget med at fylde op til et bestemt niveau, men jeg synes heller ikke at udtrykket "at toppe op" har udbredelse nok til at man kan bruge det. Forslag modtages gerne.
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyld op %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyld kontosaldo op"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyld op..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du skal aktivere en af dine konti for at kunne se kontakter her."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Du skal aktivere %s for at kunne se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoindstillinger"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakter på et _kort"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kreditsaldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Find i kontakt_liste"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Tilslut til favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "HÃ¥ndter favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nyt _opkald…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _profilbillede"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Indstillinger"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Vis _protokoller"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Sortér efter _navn"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Sortér efter s_tatus"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konti"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokerede kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Filoverførsler"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Deltag…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Ny samtale…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offline kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlige oplysninger"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "R_um"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Søg efter kontakter…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chatrum"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4220,16 +4123,21 @@ msgstr ""
 "Kræver adgangskode: %s\n"
 "Deltagere: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte fremvisning af rumliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Kunne ikke standse fremvisning af rumliste"
 
@@ -4264,84 +4172,84 @@ msgstr "Rumliste"
 msgid "_Room:"
 msgstr "R_um:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Besked modtaget"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Besked sendt"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontakten logger på"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "En kontakt logger på"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "Kontakten logger af"
+msgstr "En kontakten logger af"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konto tilsluttet"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konto frakoblet"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Sprog"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ã…, Romeo, hvorfor er du Romeo?"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Fornægt din far, forkast det navn du bærer!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Og vil du ikke, sværg så, du er min,"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "så er jeg ikke mer en Capulet!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skal jeg nu høre mere eller tale?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julie er koblet af"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -4401,35 +4309,27 @@ msgstr "Aktivér stavekontrol for sprog:"
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Inputniveau:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Inputlydstyrke:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Stedkilder:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Log samtaler"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "PÃ¥mindelser"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Afspil lyde ved begivenheder"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4439,33 +4339,41 @@ msgstr ""
 "end din by, stat eller land vil blive vist. GPS-koordinater vil blive "
 "begrænset til første decimal."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Vis _smileys som billeder"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Vis kontakt_liste i rum"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Lyde"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Stavekontrol"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Start chat:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Denne liste indeholder kun sprog, som du har en ordbog installeret for."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temaer"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Brug _ekkoneutralisering til at forbedre opkaldskvaliteten"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
@@ -4495,18 +4403,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netværk (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Åbn nye chats i særskilte vinduer"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Offentliggør placering til mine kontakter"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Reducér placeringens nøjagtighed"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "nye fane_blade"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Status"
@@ -4563,67 +4475,67 @@ msgstr "Video slået til"
 msgid "Video Preview"
 msgstr "Forhåndsvisning for video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktkortvisning"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Gem"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Fejlfindingsvindue"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Fejlfind"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domæne"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4631,89 +4543,89 @@ msgstr ""
 "Den valgte forbindelseshåndtering understøtter ikke udvidelsen til "
 "fjernfejlfinding."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Invitér deltager"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vælg en kontakt, du vil invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Invitér"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Vis ikke nogen dialoger; udfør eventuelt arbejde (såsom import) og afslut"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Vis ingen dialoger med mindre der kun er \"Folk i nærheden\"-konti"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Vælg den givne konto til at starte med (f.eks. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konti"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konti"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Vis en bestemt tjeneste"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy-fejlfinding"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy-fejlfinding"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-samtaleklient"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Afvis"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Besvar"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Besvar med video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Afslå"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Acceptér"
 
@@ -4724,7 +4636,7 @@ msgstr "Acceptér"
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Giv"
 
@@ -4736,32 +4648,334 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "I kø"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Stilhed"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Varighed"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Din nuværende saldo er %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Beklager, du har ikke nok på din konto til det opkald."
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Fyld op"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Match store/små bogstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type chatkonto ønsker du?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Tilføjer ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Folk i nærheden"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
+"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
+"detaljerne herunder er korrekte."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Du kan ændre disse detaljer senere eller slå denne funktion fra ved at vælge "
+"<span style=\"italic\">Redigér → Konti</span> i kontaktlisten."
+
+#~ msgid "Call volume"
+#~ msgstr "Opkaldslydstyrke"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Opkaldslydstyrke, som en procentdel."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy har konverteret butterfly-logge"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Om Empathy har konverteret butterfly-logge."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Sokkeltype understøttet ikke"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mine Webkonti"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Kontoen %s redigeres via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontoen %s kan ikke redigeres i Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Start Mine Webkonti"
+
+#~ msgid "Edit %s"
+#~ msgstr "Redigér %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Annuller"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlige oplysninger"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ikke grupperet"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favoritfolk"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Redigér"
+
+#~ msgid "Select a contact"
+#~ msgstr "Vælg en kontakt"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Sammenkædede kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Vælg kontakter som skal sammenkædes"
+
+#~ msgid "New contact preview"
+#~ msgstr "Forhåndsvisning af ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Sammenkæd kontakter…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Sammenkæd kontakter"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Adskil…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
+#~ "indeholder."
+
+#~ msgid "_Link"
+#~ msgstr "_Sammenkæd"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Adskil sammenkædet kontakt \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette "
+#~ "vil splitte de sammenkædede kontakter fuldstændigt op i de kontakter de "
+#~ "består af."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Adskil"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-id:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Opkald"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Sæt din tilstedeværelse og status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Den valgte kontakt kan ikke modtage filer."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Den valgte kontakt er offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Der opstod en fejl ved import af kontiene."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Der opstod en fejl under oprettelse af kontoen."
+
+#~ msgid "There was an error."
+#~ msgstr "Der opstod en fejl."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Fejlmeddelelsen var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
+#~ "eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
+
+#~ msgid "An error occurred"
+#~ msgstr "Der opstod en fejl"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du andre chatkonti, du vil have indstillet?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Indtast dine kontodetaljer"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Hvilken type konto ønsker du at oprette?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Ønsker du at oprette andre chatkonti?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Indtast detaljerne for den nye konto"
+
+# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger "
+#~ "som bruger Google Talk, AIM, Windows Live eller mange andre "
+#~ "chatprogrammer. Med en mikrofon eller et webkamera kan du også foretage "
+#~ "lyd- eller videoopkald."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importér mine kontodetaljer fra "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jeg vil oprette en ny konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr ""
+#~ "Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil "
+#~ "videre"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Vælg de konti, du vil importere:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det var alt - indtil videre"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigér->Konti"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
+#~ "netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere "
+#~ "denne funktion, så installér venligst pakken telepathy-salut og opret en "
+#~ "\"Folk i nærheden\"-konto fra dialogvinduet \"Konti\""
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Assistent for meddelelser og VoIP-konti"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Velkommen til Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importér dine eksisterende konti"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Indtast venligst personlige detaljer"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Du er ved at oprette en ny konto, hvilket vil kassere\n"
+#~ "dine ændringer. Er du sikker på, at du vil fortsætte?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlige oplysninger"
+
+#~ msgid "Input level:"
+#~ msgstr "Inputniveau:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Inputlydstyrke:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Åbn nye chats i særskilte vinduer"
+
 #~ msgid "All"
 #~ msgstr "Alle"
 
@@ -5323,9 +5537,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Indtast et navn for konto."
 
-#~ msgid "View previous conversations with this contact"
-#~ msgstr "Vis foregående samtaler"
-
 #~ msgid "<b>Languages</b>"
 #~ msgstr "<b>Sprog</b>"
 
@@ -5401,9 +5612,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "A specific protocol error occurred that was unexpected."
 #~ msgstr "En specifik protokolfejl opstod uventet."
 
-#~ msgid "Home"
-#~ msgstr "Hjemme"
-
 #~ msgid "This service is unavailable or not found"
 #~ msgstr "Denne funktion er ikke tilgængelig."
 
@@ -5478,9 +5686,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Nogen vil gerne sende dig en fil."
 
-#~ msgid "Retry connection"
-#~ msgstr "Stop tilslutning"
-
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inviterede %s til at deltage i denne konferencesamtale."
 
@@ -5568,9 +5773,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>About</b>"
 #~ msgstr "<b>Om</b>"
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personlige detaljer</b>"
-
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 
@@ -5623,9 +5825,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Use system pro_xy"
 #~ msgstr "Benyt systemets _mellemvært"
 
-#~ msgid "_Connect"
-#~ msgstr "_Tilslut"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_Frakobl"
 
@@ -5653,9 +5852,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "_Web site:"
 #~ msgstr "Hjemmeside:"
 
-#~ msgid "irc account settings"
-#~ msgstr "<b>Kontoindstillinger</b>"
-
 #~ msgid "msn account settings"
 #~ msgstr "<b>Kontoindstillinger</b>"
 
@@ -5768,9 +5964,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Chat Rooms..."
 #~ msgstr "Samtalerum"
 
-#~ msgid "Connection Details"
-#~ msgstr "Forbindelsesdetaljer"
-
 #~ msgid "Enter the server used in the connection for this account"
 #~ msgstr ""
 #~ "Indtast den server der bliver brugt ved tilslutning for denne konto."
@@ -5908,9 +6101,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Gossip, Instant Messaging Client"
 #~ msgstr "Gossip, samtaleklient"
 
-#~ msgid "Close this chat window"
-#~ msgstr "Luk dette samtalerum"
-
 #~ msgid "Requested Information"
 #~ msgstr "Anmodede oplysninger"
 
@@ -6151,9 +6341,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Forvalgte statusbeskeder</b>"
 
-#~ msgid "Add Another Account"
-#~ msgstr "Tilføj en anden konto"
-
 #~ msgid "Configuring Service"
 #~ msgstr "Registeringstjeneste"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index cea232b12..2d3d810d5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,2380 +1,4720 @@
-# Canadian English translation of gossip.
-# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same licence as the gossip package.
+# Canadian English translations for Empathy package.
+# Copyright (C) 2012 EMPATHY'S COPYRIGHT HOLDER
+# This file is distributed under the same licence as the Empathy package.
 # Adam Weinberger <adamw@gnome.org>, 2004, 2005.
-# 
-# 
+# Tiffany Antopolski <tiffany.antopolski@gmail.com>, 2012.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:46+0200\n"
-"PO-Revision-Date: 2005-08-27 20:31-0500\n"
-"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: Canadian English <adamw@gnome.org>\n"
+"Project-Id-Version: Empathy\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-08 15:44+0000\n"
+"PO-Revision-Date: 2012-02-08 19:16-0500\n"
+"Last-Translator: Tiffany Antopolski <tiffany.antopolski@gmail.com>\n"
+"Language-Team: Canadian English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_CA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/empathy.desktop.in.h:1
-#, fuzzy
-msgid "Empathy Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.h:2
-msgid "Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
 
-#: ../data/empathy.schemas.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Empathy Internet Messaging"
 
-#: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
-msgstr "Chat window theme"
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
-#: ../data/empathy.schemas.in.h:4
-#, fuzzy
-msgid "Compact contact list"
-msgstr "_Show Contact List"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
 
-#: ../data/empathy.schemas.in.h:5
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Default directory to select an avatar image from"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Enable popup when contact is available"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Show avatars"
+msgstr "Show avatars"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/empathy.schemas.in.h:8
-#, fuzzy
-msgid "Enable sound when away"
-msgstr "Disable sounds when _away"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Show protocols"
+msgstr "Show protocols"
 
-#: ../data/empathy.schemas.in.h:9
-#, fuzzy
-msgid "Enable sound when busy"
-msgstr "Disable sounds when _busy"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/empathy.schemas.in.h:10
-#, fuzzy
-msgid "Enable spell checker"
-msgstr "Enable spell checking"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Compact contact list"
+msgstr "Compact contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/empathy.schemas.in.h:14
-#, fuzzy
-msgid "Show avatars"
-msgstr "_Show Contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
 
-#: ../data/empathy.schemas.in.h:15
-#, fuzzy
-msgid "Show hint about closing the main window"
-msgstr "The height of the main window."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
-#: ../data/empathy.schemas.in.h:17
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
-#: ../data/empathy.schemas.in.h:18
-msgid "The last directory that an avatar image was chosen from."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 
-#: ../data/empathy.schemas.in.h:19
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Play a sound for incoming messages"
+msgstr "Play a sound for incoming messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Play a sound for outgoing messages"
+msgstr "Play a sound for outgoing messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/empathy.schemas.in.h:21
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/empathy.schemas.in.h:22
-#, fuzzy
-msgid "Use theme for chat rooms"
-msgstr "_Invite to Chat Room"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Chat window theme"
+msgstr "Chat window theme"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/empathy.schemas.in.h:25
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Whether or not to play sounds when away."
-msgstr "Whether or not to play sounds when away."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Whether or not to play sounds when busy."
-msgstr "Whether or not to play sounds when busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
-#: ../data/empathy.schemas.in.h:28
-#, fuzzy
-msgid "Whether or not to show a popup when a contact becomes available."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/empathy.schemas.in.h:29
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
-#: ../data/empathy.schemas.in.h:32
-#, fuzzy
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/empathy.schemas.in.h:33
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialog"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Camera device"
+msgstr "Camera device"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Camera position"
+msgstr "Camera position"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Echo cancellation support"
+msgstr "Echo cancellllation support"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellllation filter."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 
-#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184
-#: ../libempathy/gossip-presence.c:283
-msgid "Offline"
-msgstr "Offline"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the cellular network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Whether Empathy can use the cellular network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "No reason was specified"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
 
-#: ../libempathy/gossip-presence.c:274
-#, fuzzy
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "You cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "File transfer not supported by remote contact"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "The selected file is not a regular file"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "The selected file is empty"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Missed call from %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Called %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
-msgstr "Available..."
+msgstr "Available"
 
-#: ../libempathy/gossip-presence.c:276
-#, fuzzy
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
-msgstr "Busy..."
+msgstr "Busy"
 
-#: ../libempathy/gossip-presence.c:279
-#, fuzzy
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
-msgstr "Away..."
-
-#: ../libempathy-gtk/empathy-main-window.c:254
-#, fuzzy
-msgid "Show and edit accounts"
-msgstr "_Show Contacts"
+msgstr "Away"
 
-#: ../libempathy-gtk/empathy-main-window.c:456
-msgid "Group"
-msgstr "Group"
+#: ../libempathy/empathy-utils.c:240
+msgid "Invisible"
+msgstr "Invisible"
 
-#: ../libempathy-gtk/empathy-main-window.c:477
-#, fuzzy
-msgid "Contact"
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:242
+msgid "Offline"
+msgstr "Offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-#, fuzzy
-msgid "Contact List - Empathy"
-msgstr "_Hide Contact List"
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-#, fuzzy
-msgid "Context"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:285
+msgid "No reason specified"
+msgstr "No reason specified"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-#, fuzzy
-msgid "Join _Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+msgid "Status is set to offline"
+msgstr "Status is set to offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-#: ../libempathy-gtk/gossip-chat.glade.h:10
-msgid "Join _New..."
-msgstr ""
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+msgid "Network error"
+msgstr "Network error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-#, fuzzy
-msgid "Manage Favorites..."
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+msgid "Authentication failed"
+msgstr "Authentication failed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+msgid "Encryption error"
+msgstr "Encryption error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
-#, fuzzy
-msgid "_About"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:295
+msgid "Name in use"
+msgstr "Name in use"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-#: ../libempathy-gtk/gossip-chat.glade.h:15
-msgid "_Add Contact..."
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "_Chat"
-msgstr "_Chat"
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+msgid "Certificate expired"
+msgstr "Certificate expired"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-msgid "_Contents"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-#: ../libempathy-gtk/gossip-chat.glade.h:21
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "_Edit"
-msgstr "Edit"
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
-msgstr ""
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
-msgstr "_New Message..."
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+msgid "Certificate self-signed"
+msgstr "Certificate self-signed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
-msgstr "_Personal Information"
+#: ../libempathy/empathy-utils.c:311
+msgid "Certificate error"
+msgstr "Certificate error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-msgid "_Preferences"
-msgstr "_Preferences"
+#: ../libempathy/empathy-utils.c:345
+msgid "Encryption is not available"
+msgstr "Encryption is not available"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr ""
+#: ../libempathy/empathy-utils.c:347
+msgid "Certificate is invalid"
+msgstr "Certificate is invalid"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-#: ../libempathy-gtk/gossip-chat.glade.h:25
-#, fuzzy
-msgid "_Room"
-msgstr "_Room:"
+#: ../libempathy/empathy-utils.c:349
+msgid "Connection has been refused"
+msgstr "Connection has been refused"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-#: ../libempathy-gtk/gossip-chat.glade.h:28
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "_View Previous Conversations"
-msgstr "_Conversation"
+#: ../libempathy/empathy-utils.c:351
+msgid "Connection can't be established"
+msgstr "Connection can't be established"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
-msgstr "Status"
+#: ../libempathy/empathy-utils.c:353
+msgid "Connection has been lost"
+msgstr "Connection has been lost"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:63
+#: ../libempathy/empathy-utils.c:357
 msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
+"Connection has been replaced by a new connection using the same resource"
 msgstr ""
+"Connection has been replaced by a new connection using the same resource"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "The account already exists on the server"
+msgstr "The account already exists on the server"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Server is currently too busy to handle the connection"
+msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:67
+#: ../libempathy/empathy-utils.c:364
+msgid "Certificate has been revoked"
+msgstr "Certificate has been revoked"
+
+#: ../libempathy/empathy-utils.c:366
 msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:71
+#: ../libempathy/empathy-utils.c:369
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:99
-#, fuzzy
-msgid "An Instant Messaging client for GNOME"
-msgstr "Gossip, Instant Messaging Client"
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:105
-#, fuzzy
-msgid "translator-credits"
-msgstr "Adam Weinberger"
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:224
-#, fuzzy
-msgid "Disable"
-msgstr "Available..."
+#: ../libempathy/empathy-utils.c:534
+msgid "People Nearby"
+msgstr "People Nearby"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:227
-msgid "Enable"
-msgstr ""
+#: ../libempathy/empathy-utils.c:539
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japan"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:261
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3
-#, fuzzy
-msgid "<b>No Account Selected</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-utils.c:568
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:263
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
-msgstr ""
+#: ../libempathy/empathy-utils.c:569
+msgid "Facebook Chat"
+msgstr "Facebook Chat"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:272
-#, fuzzy
-msgid "<b>No Accounts Configured</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d second ago"
+msgstr[1] "%d seconds ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:274
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring."
-msgstr ""
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:362
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6
-msgid "Accounts"
-msgstr "Accounts"
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:857
+#: ../libempathy/empathy-time.c:108
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:863
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week ago"
+msgstr[1] "%d weeks ago"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "in the future"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "All accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
+msgid "Account"
+msgstr "Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:683
+msgid "Password"
+msgstr "Password"
+
+#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Username:"
+msgstr "Username:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1710
+msgid "A_pply"
+msgstr "A_pply"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1739
+msgid "L_og in"
+msgstr "L_og in"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1812
+msgid "This account already exists on the server"
+msgstr "This account already exists on the server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1816
+msgid "Create a new account on the server"
+msgstr "Create a new account on the server"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2241
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s on %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2267
+#, c-format
+msgid "%s Account"
+msgstr "%s Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2271
+msgid "New account"
+msgstr "New account"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr "What is your AIM screen name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+msgid "Login I_D:"
+msgstr "Login I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "What is your GroupWise User ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "What is your GroupWise password?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Example:</b> 123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "Ch_aracter set:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "What is your ICQ UIN?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "What is your ICQ password?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+msgid "Register"
+msgstr "Register"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr "None"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "Character set:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 msgstr ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Nickname:"
+msgstr "Nickname:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2
-#, fuzzy
-msgid "<b>New Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Password:"
+msgstr "Password:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4
-#, fuzzy
-msgid "<b>Settings</b>"
-msgstr "<b>Status</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Quit message:"
+msgstr "Quit message:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5
-msgid "A unique name for this account to identify it personally to you."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Real name:"
+msgstr "Real name:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7
-#, fuzzy
-msgid "Cr_eate"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8
-msgid "Imendio "
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9
-msgid "Jabber"
-msgstr "Jabber"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 msgstr ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13
-msgid "_Name:"
-msgstr "_Name:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "What is your Facebook password?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14
-#, fuzzy
-msgid "_Type:"
-msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "What is your Google ID?"
 
-#: ../libempathy-gtk/gossip-account-widget-generic.c:144
-#: ../libempathy-gtk/gossip-account-widget-generic.c:186
-#, c-format
-msgid "%s:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1
-#, fuzzy
-msgid ""
-"<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
-"small>"
-msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "What is your Google password?"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3
-msgid "Login I_D:"
-msgstr "Login I_D:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4
-#, fuzzy
-msgid "Pass_word:"
-msgstr "_Password:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
-msgstr "R_esource:"
+msgstr "Reso_urce:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6
-#, fuzzy
-msgid "Use encryption (SS_L)"
-msgstr "Use _encryption (SSL)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7
-#, fuzzy
-msgid "_Port:"
-msgstr "Por_t:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8
-msgid "_Server:"
-msgstr "_Server:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9
-msgid "jabber account settings"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your Jabber ID?"
+msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:314
-msgid "Disconnected"
-msgstr "Disconnected"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:858
-msgid "Insert Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:906
-msgid "_Check Word Spelling..."
-msgstr "_Check Word Spelling..."
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+msgid "What is your desired Jabber password?"
+msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:1244
-msgid "Connected"
-msgstr "Connected"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:1
-msgid "C_lear"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:2
-msgid "Change _Topic..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "Nic_kname:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:4
-#, fuzzy
-msgid "Contact Infor_mation"
-msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:5
-#, fuzzy
-msgid "Cu_t"
-msgstr "Ch_at"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "_First Name:"
+msgstr "_First Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:6
-msgid "In_vite..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:7
-msgid "Insert _Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:8
-#, fuzzy
-msgid "Invitation _message:"
-msgstr "Enter status message:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:9
-msgid "Invite"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:11
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Example:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:12
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:13
-msgid "Select who would you like to invite:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:14
-msgid "You have been invited to join a chat conference."
-msgstr "You have been invited to join a chat conference."
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:16
-#, fuzzy
-msgid "_Add To Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:17
-msgid "_Close"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "STUN Server:"
+msgstr "STUN Server:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:18
-msgid "_Conversation"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:19
-msgid "_Copy"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:20
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "Mechanism:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Loose Routing"
+msgstr "Loose Routing"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP login ID?"
+msgstr "What is your SIP login ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "I_gnore conference and chat room invitations"
+msgstr "I_gnore conference and chat room invitations"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "What is your Yahoo! ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "What is your Yahoo! password?"
+msgstr "What is your Yahoo! password?"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+msgid "Couldn't convert image"
+msgstr "Couldn't convert image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:22
-msgid "_Next Tab"
-msgstr "_Next Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
+msgstr "None of the accepted image formats are supported on your system"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:23
-msgid "_Paste"
-msgstr ""
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Couldn't save picture to file"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:24
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+msgid "Select Your Avatar Image"
+msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:26
-msgid "_Show Contacts"
-msgstr "_Show Contacts"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Take a picture..."
 
-#: ../libempathy-gtk/gossip-chat.glade.h:27
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+msgid "No Image"
+msgstr "No Image"
 
-#: ../libempathy-gtk/gossip-chat-view.c:544
-msgid "_Copy Link Address"
-msgstr "_Copy Link Address"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+msgid "Images"
+msgstr "Images"
 
-#: ../libempathy-gtk/gossip-chat-view.c:552
-msgid "_Open Link"
-msgstr "_Open Link"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+msgid "All Files"
+msgstr "All Files"
 
-#: ../libempathy-gtk/gossip-chat-view.c:889
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-avatar-image.c:322
+msgid "Click to enlarge"
+msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/gossip-chat-window.c:685
-#: ../libempathy-gtk/gossip-chat-window.c:715
-#, fuzzy
-msgid "New Message"
-msgid_plural "New Messages"
-msgstr[0] "_New Message..."
-msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "There was an error starting the call"
 
-#: ../libempathy-gtk/gossip-chat-window.c:691
-#, fuzzy
-msgid "Chat Room"
-msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "The specified contact doesn't support calls"
 
-#: ../libempathy-gtk/gossip-chat-window.c:696
-#: ../libempathy-gtk/gossip-chat-window.c:719
-#, fuzzy, c-format
-msgid "Conversation"
-msgid_plural "Conversations (%d)"
-msgstr[0] "_Conversation"
-msgstr[1] "_Conversation"
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "The specified contact is offline"
 
-#: ../libempathy-gtk/gossip-chat-window.c:1295
-msgid "Typing a message."
-msgstr "Typing a message."
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "The specified contact is not valid"
 
-#: ../libempathy-gtk/gossip-contact-list.c:290
-#, fuzzy
-msgid "_Contact"
-msgstr "_Add Contact..."
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Emergency calls are not supported on this protocol"
 
-#: ../libempathy-gtk/gossip-contact-list.c:294
-#, fuzzy
-msgid "_Group"
-msgstr "Group"
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
 
-#: ../libempathy-gtk/gossip-contact-list.c:298
-#, fuzzy
-msgid "Chat with contact"
-msgstr "Add a contact"
+#: ../libempathy-gtk/empathy-chat.c:710
+msgid "Failed to open private chat"
+msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "Infor_mation"
-msgstr "Contact _Information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "View contact information"
-msgstr "Contact information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Re_name"
-msgstr "/Re_name group"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Rename"
-msgstr "File name:"
-
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "Edit the groups and name for this contact"
-msgstr ""
-"Please enter a new nickname for the contact\n"
-"%s"
+#: ../libempathy-gtk/empathy-chat.c:768
+msgid "Topic not supported on this conversation"
+msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "_Remove"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:774
+msgid "You are not allowed to change the topic"
+msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "Remove contact"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� is not a valid contact ID"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-#, fuzzy
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-chat.c:1068
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: clear all messages from the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1071
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>: set the topic of the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1074
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chat room ID>: join a new chat room"
+
+#: ../libempathy-gtk/empathy-chat.c:1077
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-msgid "Invite to a currently open chat room"
+#: ../libempathy-gtk/empathy-chat.c:1081
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 msgstr ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "_Send File..."
-msgstr "/_Send File..."
+#: ../libempathy-gtk/empathy-chat.c:1085
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "Send a file"
-msgstr "Select a file"
+#: ../libempathy-gtk/empathy-chat.c:1088
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "View previous conversations with this contact"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-chat.c:1091
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/gossip-preferences.c:250
-msgid "Language"
-msgstr "Language"
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:1
-#, fuzzy
-msgid "<b>Appearance</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>About</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:3
-#, fuzzy
-msgid "<b>Behaviour</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:4
-#, fuzzy
-msgid "<b>Contact List</b>"
-msgstr "<b>Status</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:5
-msgid "<b>Languages</b>"
-msgstr "<b>Languages</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:6
-#, fuzzy
-msgid "<b>Options</b>"
-msgstr "Connection"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:7
-#, fuzzy
-msgid "<b>Visual</b>"
-msgstr "<b>Options</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:8
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
 msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+
+#: ../libempathy-gtk/empathy-chat.c:1102
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:9
-msgid "Avatars are user chosen images shown in the contact list"
+#: ../libempathy-gtk/empathy-chat.c:1105
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 msgstr ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:10
-#, fuzzy
-msgid "Chat Th_eme:"
-msgstr "Chat window theme"
+#: ../libempathy-gtk/empathy-chat.c:1124
+#, c-format
+msgid "Usage: %s"
+msgstr "Usage: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:11
-msgid "Display notifications when contacts come _online"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1169
+msgid "Unknown command"
+msgstr "Unknown command"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:12
-#, fuzzy
-msgid "Enable sounds when _away"
-msgstr "Disable sounds when _away"
+#: ../libempathy-gtk/empathy-chat.c:1295
+msgid "Unknown command; see /help for the available commands"
+msgstr "Unknown command; see /help for the available commands"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:13
-#, fuzzy
-msgid "Enable sounds when _busy"
-msgstr "Disable sounds when _busy"
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr "insufficient balance to send message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:14
-msgid "General"
-msgstr "General"
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:15
-#, fuzzy
-msgid "Notifications"
-msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:16
-#, fuzzy
-msgid "Preferences"
-msgstr "_Preferences"
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:17
-msgid "Show _avatars"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1593
+msgid "not capable"
+msgstr "not capable"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:18
-#, fuzzy
-msgid "Show _smileys as images"
-msgstr "Convert _smileys to graphical images"
+#: ../libempathy-gtk/empathy-chat.c:1600
+msgid "offline"
+msgstr "offline"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:19
-#, fuzzy
-msgid "Show co_mpact contact list"
-msgstr "_Show Contact List"
+#: ../libempathy-gtk/empathy-chat.c:1603
+msgid "invalid contact"
+msgstr "invalid contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:20
-msgid "Sort by _name"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1606
+msgid "permission denied"
+msgstr "permission denied"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:21
-msgid "Sort by s_tate"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1609
+msgid "too long message"
+msgstr "too long message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:22
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#: ../libempathy-gtk/empathy-chat.c:1612
+msgid "not implemented"
+msgstr "not implemented"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:23
-msgid "Themes"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1616
+msgid "unknown"
+msgstr "unknown"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:24
-#, fuzzy
-msgid "_Enable spell checking"
-msgstr "Enable spell checking"
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
+msgid "Topic:"
+msgstr "Topic:"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:25
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+#: ../libempathy-gtk/empathy-chat.c:1698
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:26
-msgid "_Play sound when messages arrive"
-msgstr "_Play sound when messages arrive"
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:27
-#, fuzzy
-msgid "_Use for chat rooms"
-msgstr "_Invite to Chat Room"
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
+msgid "No topic defined"
+msgstr "No topic defined"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:702
-#, fuzzy
-msgid "Custom message..."
-msgstr "_New Message..."
+#: ../libempathy-gtk/empathy-chat.c:2221
+msgid "(No Suggestions)"
+msgstr "(No Suggestions)"
 
-#. Clear list
-#: ../libempathy-gtk/gossip-presence-chooser.c:724
-#, fuzzy
-msgid "Clear List..."
-msgstr "Clear List"
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2289
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Add '%s' to Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:803
-#, fuzzy
-msgid "Are you sure you want to clear the list?"
-msgstr "Do you want to accept this file?"
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2326
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:807
-msgid ""
-"This will remove any custom messages you have added to the list of preset "
-"status messages."
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:2396
+msgid "Insert Smiley"
+msgstr "Insert Smiley"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:812
-msgid "Clear List"
-msgstr "Clear List"
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
+msgid "_Send"
+msgstr "_Send"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1
-msgid "Enter status message:"
-msgstr "Enter status message:"
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2471
+msgid "_Spelling Suggestions"
+msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2
-#, fuzzy
-msgid "Status Message Presets"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2560
+msgid "Failed to retrieve recent logs"
+msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3
-#, fuzzy
-msgid "_Add to status message list"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2699
+#, c-format
+msgid "%s has disconnected"
+msgstr "%s has disconnected"
 
-#: ../libempathy-gtk/gossip-private-chat.c:198
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
-msgid "%s went offline"
-msgstr "%s went offline"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/gossip-private-chat.c:212
-#, fuzzy, c-format
-msgid "%s has come online"
-msgstr "%s comes online"
+#: ../libempathy-gtk/empathy-chat.c:2709
+#, c-format
+msgid "%s was kicked"
+msgstr "%s was kicked"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:87
-msgid "Classic"
-msgstr ""
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2717
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:88
-#, fuzzy
-msgid "Simple"
-msgstr "Example: %s"
+#: ../libempathy-gtk/empathy-chat.c:2720
+#, c-format
+msgid "%s was banned"
+msgstr "%s was banned"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:89
-#, fuzzy
-msgid "Clean"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-chat.c:2724
+#, c-format
+msgid "%s has left the room"
+msgstr "%s has left the room"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:2733
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:90
-#, fuzzy
-msgid "Blue"
-msgstr "Basque"
+#: ../libempathy-gtk/empathy-chat.c:2758
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s has joined the room"
 
-#: ../src/empathy-main.c:145
-msgid "Don't connect on startup"
-msgstr "Don't connect on startup"
+#: ../libempathy-gtk/empathy-chat.c:2783
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+msgid "Disconnected"
+msgstr "Disconnected"
 
-#: ../src/empathy-main.c:155
-#, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "Gossip Instant Messenger"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3634
+msgid "Would you like to store this password?"
+msgstr "Would you like to store this password?"
 
-#~ msgid "Gossip Instant Messenger"
-#~ msgstr "Gossip Instant Messenger"
+#: ../libempathy-gtk/empathy-chat.c:3640
+msgid "Remember"
+msgstr "Remember"
 
-#, fuzzy
-#~ msgid "Joining"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-chat.c:3650
+msgid "Not now"
+msgstr "Not now"
 
-#, fuzzy
-#~ msgid "Active"
-#~ msgstr "Actions"
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+msgid "Retry"
+msgstr "Retry"
 
-#~ msgid "Unknown"
-#~ msgstr "Unknown"
+#: ../libempathy-gtk/empathy-chat.c:3698
+msgid "Wrong password; please try again:"
+msgstr "Wrong password; please try again:"
 
-#, fuzzy
-#~ msgid "Error"
-#~ msgstr "Last Error"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3828
+msgid "This room is protected by a password:"
+msgstr "This room is protected by a password:"
 
-#, fuzzy
-#~ msgid "Participant"
-#~ msgid_plural "Participants"
-#~ msgstr[0] "Galician"
-#~ msgstr[1] "Galician"
+#: ../libempathy-gtk/empathy-chat.c:3855
+msgid "Join"
+msgstr "Join"
 
-#, fuzzy
-#~ msgid "No affiliation"
-#~ msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
+msgid "Connected"
+msgstr "Connected"
 
-#~ msgid "The nickname you have chosen is already in use."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-chat.c:4102
+msgid "Conversation"
+msgstr "Conversation"
 
-#~ msgid "The chat room you tried to join requires a password."
-#~ msgstr "The chat room you tried to join requires a password."
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Unknown or invalid identifier"
+msgstr "Unknown or invalid identifier"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking temporarily unavailable"
+msgstr "Contact blocking temporarily unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Contact blocking unavailable"
+msgstr "Contact blocking unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+msgid "Permission Denied"
+msgstr "Permission Denied"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+msgid "Could not block contact"
+msgstr "Could not block contact"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+msgid "Edit Blocked Contacts"
+msgstr "Edit Blocked Contacts"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blocked Contacts"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remove"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
+msgid "_Copy Link Address"
+msgstr "_Copy Link Address"
 
-#~ msgid "The remote conference server did not respond in a sensible time."
-#~ msgstr "The remote conference server did not respond in a sensible time."
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Open Link"
+msgstr "_Open Link"
 
-#~ msgid "The conference server you tried to join could not be found."
-#~ msgstr "The conference server you tried to join could not be found."
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
+msgid "%A %B %d %Y"
+msgstr "%A %B %e %Y"
 
-#, fuzzy
-#~ msgid "An unknown error occurred, check your details are correct."
-#~ msgstr "Ensure that your details are correct."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "New Contact"
 
-#, fuzzy
-#~ msgid "Unavailable"
-#~ msgstr "Service Unavailable"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "Block %s?"
 
-#, fuzzy
-#~ msgid "An unknown error occurred."
-#~ msgstr "An unknown error occurred."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Are you sure you want to block '%s' from contacting you again?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Block"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Report this contact as abusive"
+msgstr[1] "_Report these contacts as abusive"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "Subscription Request"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_Block User"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+msgid "Search contacts"
+msgstr "Search contacts"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+msgid "Search: "
+msgstr "Search: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+msgid "_Add Contact"
+msgstr "_Add Contact"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+msgid "No contacts found"
+msgstr "No contacts found"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "Your message introducing yourself:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Please let me see when you're online. Thanks!"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Country ISO Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Country:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "State:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "City:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Postal Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Street:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Building:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Floor:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Room:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Text:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "Description:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Accuracy Level:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Error:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Vertical Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Horizontal Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Bearing:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Climb Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Last Updated on:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Longitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "Latitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Altitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
+msgid "Location"
+msgstr "Location"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y at %I:%M %p UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "Save Avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "Unable to save avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Contact Details"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifier:"
+
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information requested…"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version:"
+msgstr "Version:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
+msgid "Groups"
+msgstr "Groups"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
 
-#~ msgid "Connection refused."
-#~ msgstr "Connection refused."
+#: ../libempathy-gtk/empathy-groups-widget.c:362
+msgid "_Add Group"
+msgstr "_Add Group"
 
-#~ msgid "Server address could not be resolved."
-#~ msgstr "Server address could not be resolved."
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "Connection timed out."
-#~ msgstr "Connection timed out."
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
+msgid "Group"
+msgstr "Group"
 
-#~ msgid "Authentication failed."
-#~ msgstr "Authentication failed."
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "The following identity will be blocked:"
+msgstr[1] "The following identities will be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "The following identity can not be blocked:"
+msgstr[1] "The following identities can not be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:172
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "Select account to use to place the call"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "Work"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "HOME"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
 
-#, fuzzy
-#~ msgid "The username you are trying already exists."
-#~ msgstr "The nickname you have chosen is already in use."
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "Infor_mation"
 
-#, fuzzy
-#~ msgid "The username you are trying is not valid."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edit"
 
-#, fuzzy
-#~ msgid "This feature is unavailable."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
 
-#, fuzzy
-#~ msgid "new account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
 
-#~ msgid "Home"
-#~ msgstr "Home"
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
 
-#~ msgid "Couldn't send message!"
-#~ msgstr "Could not send message."
+#: ../libempathy-gtk/empathy-individual-view.c:2306
+msgid "Delete and _Block"
+msgstr "Delete and _Block"
 
-#~ msgid "Connection could not be opened"
-#~ msgstr "Connection could not be opened"
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
 
-#, fuzzy
-#~ msgid "This service is unavailable or not found"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Removing group"
 
-#, fuzzy
-#~ msgid "Registration is required"
-#~ msgstr "Registration Required"
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Remove"
 
-#, fuzzy
-#~ msgid "There was an internal service error"
-#~ msgstr "Internal Server Error"
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
 
-#, fuzzy
-#~ msgid "This feature is not implemented"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2485
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
 
-#, fuzzy
-#~ msgid "The remote service timed out"
-#~ msgstr "Remote Server Timeout"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Removing contact"
 
-#~ msgid "Disconnect"
-#~ msgstr "Disconnect"
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Linked contact containing %u contact"
+msgstr[1] "Linked contacts containing %u contacts"
 
-#~ msgid "Connect"
-#~ msgstr "Connect"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Location</b> at (date)"
 
-#, fuzzy
-#~ msgid "Successfully registered your new account settings."
-#~ msgstr "Successfully registered the account"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "Online from a phone or mobile device"
 
-#, fuzzy
-#~ msgid "Failed to register your new account settings."
-#~ msgstr "Failed registering the account"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "New Network"
 
-#, fuzzy
-#~ msgid "Successfully changed your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+msgid "Choose an IRC network"
+msgstr "Choose an IRC network"
 
-#, fuzzy
-#~ msgid "Failed to change your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+msgid "Reset _Networks List"
+msgstr "Reset _Networks List"
 
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a new password for this account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "No information is available for this contact."
-#~ msgstr "No information is available for this contact."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "new server"
 
-#~ msgid "Information requested, please wait..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
 
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "I would like to add you to my contact list."
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "History"
 
-#~ msgid "To summarize:"
-#~ msgstr "To summarize:"
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "Show"
 
-#, fuzzy
-#~ msgid "%d new message"
-#~ msgid_plural "%d new messages"
-#~ msgstr[0] "_New Message..."
-#~ msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "Search"
 
-#, fuzzy
-#~ msgid "%d subscription request"
-#~ msgid_plural "%d subscription requests"
-#~ msgstr[0] "Gossip - Subscription Request"
-#~ msgstr[1] "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat in %s"
 
-#, fuzzy
-#~ msgid "%d file transfer request"
-#~ msgid_plural "%d file transfer requests"
-#~ msgstr[0] "Gossip - File Transfer Request"
-#~ msgstr[1] "Gossip - File Transfer Request"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat with %s"
 
-#, fuzzy
-#~ msgid "%d server message"
-#~ msgid_plural "%d server messages"
-#~ msgstr[0] "Could not send message."
-#~ msgstr[1] "Could not send message."
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
 
-#, fuzzy
-#~ msgid "%d error"
-#~ msgid_plural "%d errors"
-#~ msgstr[0] "Last Error"
-#~ msgstr[1] "Last Error"
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1291
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
 
-#, fuzzy
-#~ msgid "If you quit, you will lose all unread information."
-#~ msgstr "If you quit, you will loose all unread information."
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
 
-#, fuzzy
-#~ msgid "Edit Account _Details"
-#~ msgstr "Edit your chat room details:"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s second"
+msgstr[1] "%s seconds"
 
-#~ msgid "Word"
-#~ msgstr "Word"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
 
-#~ msgid "New message from %s"
-#~ msgstr "New message from %s"
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Call took %s, ended at %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "Today"
+
+#: ../libempathy-gtk/empathy-log-window.c:1726
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1741
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "Who"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "When"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "Anything"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "Text chats"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "Calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "Incoming calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "Outgoing calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "Missed calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "What"
+
+#: ../libempathy-gtk/empathy-log-window.c:3782
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Are you sure you want to delete all logs of previous conversations?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3786
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../libempathy-gtk/empathy-log-window.c:3793
+msgid "Delete from:"
+msgstr "Delete from:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_File"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Edit"
 
-#, fuzzy
-#~ msgid "Your invitation has been declined"
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Delete All History..."
+msgstr "Delete All History..."
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Profile"
+msgstr "Profile"
 
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "Name:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
-#, fuzzy
-#~ msgid "Room"
-#~ msgstr "_Room:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "page 2"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Enter a contact identifier or phone number:"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+msgid "New Conversation"
+msgstr "New Conversation"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+msgid "New Call"
+msgstr "New Call"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentification failed for account <b>%s</b>"
 
-#, fuzzy
-#~ msgid "Auto Connect"
-#~ msgstr "Stop Connecting"
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Enter your password for account\n"
+"<b>%s</b>"
+
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
+msgid "Custom Message…"
+msgstr "Custom Message…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "Edit Custom Messages…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
+msgid "Click to remove this status as a favorite"
+msgstr "Click to remove this status as a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
+msgid "Click to make this status a favorite"
+msgstr "Click to make this status a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
+msgid "Set status"
+msgstr "Set status"
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+msgid "Custom messages…"
+msgstr "Custom messages…"
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "New %s account"
 
-#, fuzzy
-#~ msgid "Information requested..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Find:"
 
-#, fuzzy
-#~ msgid "Do you want to remove this contact from your roster?"
-#~ msgstr ""
-#~ "Do you want to remove the contact\n"
-#~ "%s\n"
-#~ "from your contact list?"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "_Previous"
 
-#~ msgid ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "_Next"
 
-#~ msgid "Select"
-#~ msgstr "Select"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
-#~ msgid "Unsorted"
-#~ msgstr "Unsorted"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "Phrase not found"
 
-#~ msgid "New file transfer request from %s"
-#~ msgstr "New file transfer request from %s"
+#: ../libempathy-gtk/empathy-sound-manager.c:51
+msgid "Received an instant message"
+msgstr "Received an instant message"
 
-#~ msgid "File transfer is not supported by both parties."
-#~ msgstr "File transfer is not supported by both parties."
+#: ../libempathy-gtk/empathy-sound-manager.c:53
+msgid "Sent an instant message"
+msgstr "Sent an instant message"
 
-#~ msgid "Your file transfer offer declined."
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-sound-manager.c:55
+msgid "Incoming chat request"
+msgstr "Incoming chat request"
 
-#~ msgid "The other user decided not to continue."
-#~ msgstr "The other user decided not to continue."
+#: ../libempathy-gtk/empathy-sound-manager.c:57
+msgid "Contact connected"
+msgstr "Contact connected"
 
-#, fuzzy
-#~ msgid "Unknown error occurred during file transfer."
-#~ msgstr "Unknown error occured during file transfer."
+#: ../libempathy-gtk/empathy-sound-manager.c:59
+msgid "Contact disconnected"
+msgstr "Contact disconnected"
 
-#~ msgid "%s would like to send you a file."
-#~ msgstr "%s would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:61
+msgid "Connected to server"
+msgstr "Connected to server"
 
-#~ msgid "Someone would like to send you a file."
-#~ msgstr "Someone would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:63
+msgid "Disconnected from server"
+msgstr "Disconnected from server"
 
-#~ msgid "Select a file"
-#~ msgstr "Select a file"
+#: ../libempathy-gtk/empathy-sound-manager.c:65
+msgid "Incoming voice call"
+msgstr "Incoming voice call"
 
-#, fuzzy
-#~ msgid "Connecting..."
-#~ msgstr "Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:67
+msgid "Outgoing voice call"
+msgstr "Outgoing voice call"
 
-#, fuzzy
-#~ msgid "Retry connection"
-#~ msgstr "Stop Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:69
+msgid "Voice call ended"
+msgstr "Voice call ended"
 
-#~ msgid "Invited %s to join this chat conference."
-#~ msgstr "Invited %s to join this chat conference."
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+msgid "Edit Custom Messages"
+msgstr "Edit Custom Messages"
 
-#, fuzzy
-#~ msgid "Enter the new topic you want to set for this room:"
-#~ msgstr "What nickname do you want to use for this contact?"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message edited at %s"
 
-#, fuzzy
-#~ msgid "Topic: %s"
-#~ msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "Normal"
 
-#~ msgid "Account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Classic"
+msgstr "Classic"
 
-#, fuzzy
-#~ msgid "Conversation With"
-#~ msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Simple"
+msgstr "Simple"
 
-#~ msgid "List the available accounts"
-#~ msgstr "List the available accounts"
+#: ../libempathy-gtk/empathy-theme-manager.c:72
+msgid "Clean"
+msgstr "Clean"
 
-#~ msgid "Which account to connect to on startup"
-#~ msgstr "Which account to connect to on startup"
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Blue"
+msgstr "Blue"
 
-#~ msgid "ACCOUNT-NAME"
-#~ msgstr "ACCOUNT-NAME"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "The identity provided by the chat server cannot be verified."
 
-#~ msgid "No accounts available."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "The certificate is not signed by a Certification Authority."
 
-#~ msgid "Available accounts:"
-#~ msgstr "Available accounts:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "The certificate has expired."
 
-#~ msgid "[default]"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "The certificate hasn't yet been activated."
 
-#~ msgid "There is no account with the name '%s'."
-#~ msgstr "There is no account with the name '%s'."
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "The certificate does not have the expected fingerprint."
 
-#, fuzzy
-#~ msgid "Join"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+"The hostname verified by the certificate doesn't match the server name."
 
-#, fuzzy
-#~ msgid "Create"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "The certificate is self-signed."
 
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+"The certificate has been revoked by the issuing Certification Authority."
 
-#, fuzzy
-#~ msgid "Browsing for conference rooms, please wait..."
-#~ msgstr "Trying to join chat room, please wait..."
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "The certificate is cryptographically weak."
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "The certificate length exceeds verifiable limits."
 
-#, fuzzy
-#~ msgid "Chat!"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "The certificate is malformed."
 
-#~ msgid "%s wants to be added to your contact list."
-#~ msgstr "%s wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Expected hostname: %s"
 
-#~ msgid "Someone wants to be added to your contact list."
-#~ msgstr "Someone wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Certificate hostname: %s"
 
-#, fuzzy
-#~ msgid "Subscription request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "Continue"
+msgstr "Continue"
 
-#, fuzzy
-#~ msgid "Contact Information"
-#~ msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
 
-#~ msgid "Suggestions for the word"
-#~ msgstr "Suggestions for the word"
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#~ msgid "New subscription request from %s"
-#~ msgstr "New subscription request from %s"
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
+msgid "Remember this choice for future connections"
+msgstr "Remember this choice for future connections"
 
-#~ msgid "Do you want to add this person to your contact list?"
-#~ msgstr "Do you want to add this person to your contact list?"
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Certificate Details"
+msgstr "Certificate Details"
 
-#~ msgid "Do you want to add %s to your contact list?"
-#~ msgstr "Do you want to add %s to your contact list?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
+msgid "Unable to open URI"
+msgstr "Unable to open URI"
 
-#, fuzzy
-#~ msgid "Please enter your %s account password"
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
+msgid "Select a file"
+msgstr "Select a file"
 
-#~ msgid "Remember Password?"
-#~ msgstr "Remember Password?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
+msgid "Insufficient free space to save file"
+msgstr "Insufficient free space to save file"
 
-#~ msgid "Could not display the help contents."
-#~ msgstr "Could not display the help contents."
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
 
-#, fuzzy
-#~ msgid "Select Your Avatar Image"
-#~ msgstr "Select another and try again"
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Incoming file from %s"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "Current Locale"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armenian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Baltic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Celtic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Central European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Chinese Simplified"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Chinese Traditional"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Cyrillic/Russian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillic/Ukrainian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Greek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Hebrew Visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "Korean"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Nordic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Persian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "South European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Thai"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Western"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+msgid "No error message"
+msgstr "No error message"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+msgid "Instant Message (Empathy)"
+msgstr "Instant Message (Empathy)"
+
+#: ../src/empathy.c:437
+msgid "Don't connect on startup"
+msgstr "Don't connect on startup"
 
-#~ msgid "The server does not seem to be responding."
-#~ msgstr "The server does not seem to be responding."
+#: ../src/empathy.c:441
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Don't display the contact list or any other dialogs on startup"
 
-#~ msgid "Try again later."
-#~ msgstr "Try again later."
+#: ../src/empathy.c:456
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM Client"
 
-#, fuzzy
-#~ msgid "Change"
-#~ msgstr "Chat"
+#: ../src/empathy.c:643
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
 
-#~ msgid "Contact goes offline"
-#~ msgstr "Contact goes offline"
+#: ../src/empathy.c:645
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public Licence as published by the Free Software "
+"Foundation; either version 2 of the Licence, or (at your option) any later "
+"version."
+
+#: ../src/empathy-about-dialog.c:85
+msgid ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
+"details."
 
-#~ msgid "Contact goes online"
-#~ msgstr "Contact goes online"
+#: ../src/empathy-about-dialog.c:89
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#~ msgid "Contact ID:"
-#~ msgstr "Contact ID:"
+#: ../src/empathy-about-dialog.c:109
+msgid "An Instant Messaging client for GNOME"
+msgstr "An Instant Messaging client for GNOME"
 
-#~ msgid "Do you want to accept this file?"
-#~ msgstr "Do you want to accept this file?"
+#: ../src/empathy-about-dialog.c:115
+msgid "translator-credits"
+msgstr ""
+"Adam Weinberger\n"
+"Tiffany Antopolski"
 
-#, fuzzy
-#~ msgid "File Transfer Request"
-#~ msgstr "Gossip - File Transfer Request"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "There was an error while importing the accounts."
 
-#~ msgid "File name:"
-#~ msgstr "File name:"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "There was an error while parsing the account details."
 
-#~ msgid "File size:"
-#~ msgstr "File size:"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "There was an error while creating the account."
 
-#, fuzzy
-#~ msgid "Not supported yet"
-#~ msgstr "Not supported yet."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "There was an error."
 
-#~ msgid "This person wishes to send you this file:"
-#~ msgstr "This person wishes to send you this file:"
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr "The error message was: %s"
 
-#~ msgid "Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
 
-#~ msgid "_Accept"
-#~ msgstr "_Accept"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1276
+msgid "An error occurred"
+msgstr "An error occurred"
 
-#~ msgid "_Deny"
-#~ msgstr "_Deny"
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
 
-#, fuzzy
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-account-assistant.c:475
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Do you have any other chat accounts you want to set up?"
 
-#~ msgid "Account:"
-#~ msgstr "Account:"
+#: ../src/empathy-account-assistant.c:481
+msgid "Enter your account details"
+msgstr "Enter your account details"
 
-#, fuzzy
-#~ msgid "Browse:"
-#~ msgstr "Faroese"
+#: ../src/empathy-account-assistant.c:486
+msgid "What kind of chat account do you want to create?"
+msgstr "What kind of chat account do you want to create?"
 
-#, fuzzy
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-account-assistant.c:492
+msgid "Do you want to create other chat accounts?"
+msgstr "Do you want to create other chat accounts?"
 
-#, fuzzy
-#~ msgid "Group Chat"
-#~ msgstr "Gossip - Chat"
+#: ../src/empathy-account-assistant.c:499
+msgid "Enter the details for the new account"
+msgstr "Enter the details for the new account"
 
-#, fuzzy
-#~ msgid "Join New"
-#~ msgstr "_Join"
+#: ../src/empathy-account-assistant.c:614
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+
+#: ../src/empathy-account-assistant.c:631
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "Do you have an account you've been using with another chat program?"
+
+#: ../src/empathy-account-assistant.c:655
+msgid "Yes, import my account details from "
+msgstr "Yes, import my account details from "
+
+#: ../src/empathy-account-assistant.c:676
+msgid "Yes, I'll enter my account details now"
+msgstr "Yes, I'll enter my account details now"
+
+#: ../src/empathy-account-assistant.c:698
+msgid "No, I want a new account"
+msgstr "No, I want a new account"
+
+#: ../src/empathy-account-assistant.c:708
+msgid "No, I just want to see people online nearby for now"
+msgstr "No, I just want to see people online nearby for now"
+
+#: ../src/empathy-account-assistant.c:729
+msgid "Select the accounts you want to import:"
+msgstr "Select the accounts you want to import:"
+
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-account-assistant.c:823
+msgid "No, that's all for now"
+msgstr "No, that's all for now"
+
+#: ../src/empathy-account-assistant.c:1088
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
 
-#, fuzzy
-#~ msgid "Join room on start_up"
-#~ msgstr "Join Room on Start_up"
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
+msgid "Edit->Accounts"
+msgstr "Edit->Accounts"
 
-#~ msgid "N_ame:"
-#~ msgstr "N_ame:"
+#: ../src/empathy-account-assistant.c:1110
+msgid "I do _not want to enable this feature for now"
+msgstr "I do _not want to enable this feature for now"
 
-#~ msgid "S_erver:"
-#~ msgstr "S_erver:"
+#: ../src/empathy-account-assistant.c:1148
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+
+#: ../src/empathy-account-assistant.c:1154
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut not installed"
+
+#: ../src/empathy-account-assistant.c:1200
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Messaging and VoIP Accounts Assistant"
+
+#: ../src/empathy-account-assistant.c:1234
+msgid "Welcome to Empathy"
+msgstr "Welcome to Empathy"
+
+#: ../src/empathy-account-assistant.c:1243
+msgid "Import your existing accounts"
+msgstr "Import your existing accounts"
+
+#: ../src/empathy-account-assistant.c:1261
+msgid "Please enter personal details"
+msgstr "Please enter personal details"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:69
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "There are unsaved modifications to your %s account."
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:73
+msgid "Your new account has not been saved yet."
+msgstr "Your new account has not been saved yet."
+
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
+msgid "Connecting…"
+msgstr "Connecting…"
+
+#: ../src/empathy-accounts-dialog.c:385
+#, c-format
+msgid "Offline — %s"
+msgstr "Offline — %s"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-accounts-dialog.c:397
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Disconnected — %s"
 
-#~ msgid "_Room:"
-#~ msgstr "_Room:"
+#: ../src/empathy-accounts-dialog.c:408
+msgid "Offline — No Network Connection"
+msgstr "Offline — No Network Connection"
 
-#~ msgid "-"
-#~ msgstr "-"
+#: ../src/empathy-accounts-dialog.c:415
+msgid "Unknown Status"
+msgstr "Unknown Status"
 
-#~ msgid "<b>About</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:427
+msgid "Offline — Account Disabled"
+msgstr "Offline — Account Disabled"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>Client Information</b>"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parametres"
 
-#, fuzzy
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
 
-#, fuzzy
-#~ msgid "<b>Name</b>"
-#~ msgstr "<b>Languages</b>"
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personal Details</b>"
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parametres..."
 
-#, fuzzy
-#~ msgid "<b>Subscription</b>"
-#~ msgstr "Connection"
+#: ../src/empathy-accounts-dialog.c:1289
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Do you want to remove %s from your computer?"
 
-#~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
-#~ msgstr "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
+#: ../src/empathy-accounts-dialog.c:1293
+msgid "This will not remove your account on the server."
+msgstr "This will not remove your account on the server."
 
-#, fuzzy
-#~ msgid "Accou_nt:"
-#~ msgstr "Account:"
+#: ../src/empathy-accounts-dialog.c:1529
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#, fuzzy
-#~ msgid "Add Contact"
-#~ msgstr "_Add Contact..."
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1705
+msgid "_Enable"
+msgstr "_Enable"
 
-#, fuzzy
-#~ msgid "Alia_s:"
-#~ msgstr "Alias:"
+#: ../src/empathy-accounts-dialog.c:1706
+msgid "_Disable"
+msgstr "_Disable"
 
-#~ msgid "Ch_at"
-#~ msgstr "Ch_at"
+#: ../src/empathy-accounts-dialog.c:2176
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#~ msgid "Client:"
-#~ msgstr "Client:"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Add…"
 
-#, fuzzy
-#~ msgid "Con_tact:"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Import…"
+msgstr "_Import…"
 
-#, fuzzy
-#~ msgid "Connect on S_tartup"
-#~ msgstr "Connect on Start_up"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#, fuzzy
-#~ msgid "Contacts"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
 
-#~ msgid "Country:"
-#~ msgstr "Country:"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "No protocol installed"
 
-#~ msgid "Decide _Later"
-#~ msgstr "Decide _Later"
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Loading account information"
+msgstr "Loading account information"
 
-#, fuzzy
-#~ msgid "Edit Contact"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-auth-client.c:286
+msgid " - Empathy authentication client"
+msgstr " - Empathy authentication client"
 
-#, fuzzy
-#~ msgid "Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-auth-client.c:302
+msgid "Empathy authentication client"
+msgstr "Empathy authentication client"
 
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "People nearby"
 
-#~ msgid "ID:"
-#~ msgstr "ID:"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy Audio/Video Client"
 
-#~ msgid ""
-#~ "If you chose to decide later you will be asked the next time you log on."
-#~ msgstr ""
-#~ "If you chose to decide later you will be asked the next time you log on."
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy Audio/Video Client"
 
-#~ msgid "Name:"
-#~ msgstr "Name:"
+#: ../src/empathy-streamed-media-window.c:433
+msgid "Contrast"
+msgstr "Contrast"
 
-#~ msgid "OS:"
-#~ msgstr "OS:"
+#: ../src/empathy-streamed-media-window.c:436
+msgid "Brightness"
+msgstr "Brightness"
 
-#, fuzzy
-#~ msgid "Personal Details"
-#~ msgstr "Personal Details Saved!"
+#: ../src/empathy-streamed-media-window.c:439
+msgid "Gamma"
+msgstr "Gamma"
 
-#, fuzzy
-#~ msgid "R_egister"
-#~ msgstr "Registration Required"
+#: ../src/empathy-streamed-media-window.c:545
+msgid "Volume"
+msgstr "Volume"
 
-#, fuzzy
-#~ msgid "Search"
-#~ msgstr "_Search..."
+#: ../src/empathy-streamed-media-window.c:1097
+msgid "_Sidebar"
+msgstr "_Sidebar"
 
-#, fuzzy
-#~ msgid "Spell Checker"
-#~ msgstr "Spell Checking"
+#: ../src/empathy-streamed-media-window.c:1117
+msgid "Audio input"
+msgstr "Audio input"
 
-#, fuzzy
-#~ msgid "Subscription Request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../src/empathy-streamed-media-window.c:1121
+msgid "Video input"
+msgstr "Video input"
 
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Suggestions for the word:"
+#: ../src/empathy-streamed-media-window.c:1129
+msgid "Dialpad"
+msgstr "Dialpad"
 
-#, fuzzy
-#~ msgid ""
-#~ "This acts as a filter to the contact list below. You can use segments of "
-#~ "contact's name or ID, for example, \"jabber.org\" will list everyone "
-#~ "using that server"
-#~ msgstr ""
-#~ "This acts as a filter of the contact list below.  You can use segments of "
-#~ "contact's name or ID; for example, \"jabber.org\" will list everyone "
-#~ "using that server. "
+#: ../src/empathy-streamed-media-window.c:1140
+msgid "Details"
+msgstr "Details"
 
-#, fuzzy
-#~ msgid "This is the name that will be used on your roster for this contact"
-#~ msgstr "This is the name that will be used on your roster for this contact."
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
+#, c-format
+msgid "Call with %s"
+msgstr "Call with %s"
+
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
+msgid "The IP address as seen by the machine"
+msgstr "The IP address as seen by the machine"
+
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
+msgid "The IP address as seen by a server on the Internet"
+msgstr "The IP address as seen by a server on the Internet"
+
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
+msgid "The IP address of the peer as seen by the other side"
+msgstr "The IP address of the peer as seen by the other side"
+
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
+msgid "The IP address of a relay server"
+msgstr "The IP address of a relay server"
+
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
+msgid "The IP address of the multicast group"
+msgstr "The IP address of the multicast group"
+
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-streamed-media-window.c:2139
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Connected — %d:%02dm"
 
-#, fuzzy
-#~ msgid "This name will be used to identify you in chat windows"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
+msgid "Technical Details"
+msgstr "Technical Details"
 
-#, fuzzy
-#~ msgid ""
-#~ "This name will be used to identify you when new contacts lookup your "
-#~ "details"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
 
-#~ msgid "Use system pro_xy"
-#~ msgstr "Use system pro_xy"
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
 
-#~ msgid "Version:"
-#~ msgstr "Version:"
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
 
-#, fuzzy
-#~ msgid "View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
+msgid "There was a failure on the network"
+msgstr "There was a failure on the network"
 
-#, fuzzy
-#~ msgid "Which account do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"The audio formats necessary for this call are not installed on your computer"
 
-#~ msgid "You are not subscribed to this contact."
-#~ msgstr "You are not subscribed to this contact."
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"The video formats necessary for this call are not installed on your computer"
 
-#~ msgid "_Connect"
-#~ msgstr "_Connect"
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
+msgid "There was a failure in the call engine"
+msgstr "There was a failure in the call engine"
+
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
+msgid "The end of the stream was reached"
+msgstr "The end of the stream was reached"
+
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
+msgid "Can't establish audio stream"
+msgstr "Can't establish audio stream"
+
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
+msgid "Can't establish video stream"
+msgstr "Can't establish video stream"
+
+#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "_Call"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "_Camera"
+msgstr "_Camera"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "_Settings"
+msgstr "_Settings"
+
+#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_View"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Help"
 
-#, fuzzy
-#~ msgid "_Description:"
-#~ msgstr "Description:"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Contents"
 
-#~ msgid "_Disconnect"
-#~ msgstr "_Disconnect"
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Swap camera"
+msgstr "Swap camera"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimise me"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Maximise me"
+msgstr "Maximise me"
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Disable camera"
+msgstr "Disable camera"
+
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
+
+#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start a video call"
+msgstr "Start a video call"
+
+#: ../src/empathy-call-window.ui.h:19
+msgid "Start an audio call"
+msgstr "Start an audio call"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "Show dialpad"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
+
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
+
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
+
+#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
 
-#, fuzzy
-#~ msgid "_Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
 
-#, fuzzy
-#~ msgid ""
-#~ "_Enter the name or contact ID of the person you want to chat to below:"
-#~ msgstr ""
-#~ "Enter the name or contact ID of the person you want to chat with below:"
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
 
-#, fuzzy
-#~ msgid "_For:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Close window"
 
-#, fuzzy
-#~ msgid "_Full Name:"
-#~ msgstr "_Name:"
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Leave room"
 
-#, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Group:"
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d unread)"
+msgstr[1] "%s (%d unread)"
 
-#, fuzzy
-#~ msgid "_Nick Name:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-chat-window.c:648
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (and %u other)"
+msgstr[1] "%s (and %u others)"
 
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "_Password:"
+#: ../src/empathy-chat-window.c:664
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d unread from others)"
+msgstr[1] "%s (%d unread from others)"
 
-#, fuzzy
-#~ msgid "_Quit Message:"
-#~ msgstr "_New Message..."
+#: ../src/empathy-chat-window.c:673
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d unread from all)"
+msgstr[1] "%s (%d unread from all)"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscribe"
+#: ../src/empathy-chat-window.c:888
+msgid "SMS:"
+msgstr "SMS:"
 
-#, fuzzy
-#~ msgid "_Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-chat-window.c:898
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sending %d message"
+msgstr[1] "Sending %d messages"
 
-#~ msgid "Preset status messages"
-#~ msgstr "Preset status messages"
+#: ../src/empathy-chat-window.c:920
+msgid "Typing a message."
+msgstr "Typing a message."
 
-#~ msgid "Preset status messages."
-#~ msgstr "Preset status messages."
+#: ../src/empathy-chat-window.ui.h:1
+msgid "_Conversation"
+msgstr "_Conversation"
 
-#~ msgid "Connecting"
-#~ msgstr "Connecting"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "C_lear"
 
-#~ msgid "Perhaps you are trying to connect to the wrong port?"
-#~ msgstr "Perhaps you are trying to connect to the wrong port?"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Insert _Smiley"
 
-#~ msgid "Perhaps the service is not currently running?"
-#~ msgstr "Perhaps the service is not currently running?"
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
 
-#~ msgid "Check your connection details."
-#~ msgstr "Check your connection details."
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#~ msgid "Perhaps the server is not running this service."
-#~ msgstr "Perhaps the server is not running this service."
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
-#~ msgid "Check your username and password are correct."
-#~ msgstr "Ensure that your username and password are correct."
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
-#~ msgid "%s will be added to your contact list."
-#~ msgstr "%s will be added to your contact list."
+#: ../src/empathy-chat-window.ui.h:8
+msgid "C_ontact"
+msgstr "C_ontact"
 
-#~ msgid "%s ID of new contact:"
-#~ msgstr "%s ID of new contact:"
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Tabs"
+msgstr "_Tabs"
 
-#~ msgid "Example: %s"
-#~ msgstr "Example: %s"
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#~ msgid "You have no Instant Messaging accounts configured!"
-#~ msgstr "You have no Instant Messaging accounts configured!"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Next Tab"
 
-#~ msgid ""
-#~ "Next you will be presented with the Account Information dialog to set "
-#~ "your details up."
-#~ msgstr ""
-#~ "Next you will be presented with the Account Information dialogue to set "
-#~ "up your details."
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#~ msgid ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#, fuzzy
-#~ msgid "Favourite"
-#~ msgstr "_Add to Favourites"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#~ msgid "Contact Information for %s"
-#~ msgstr "Contact Information for %s"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
-#, fuzzy
-#~ msgid "/Contact Infor_mation"
-#~ msgstr "/Contact _Information"
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Name"
 
-#~ msgid "/Re_name Contact"
-#~ msgstr "/Re_name Contact"
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Room"
 
-#~ msgid "/_Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Auto-Connect"
 
-#, fuzzy
-#~ msgid "/_View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Manage Favourite Rooms"
 
-#~ msgid ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Edit groups for %s"
-#~ msgstr "Edit groups for %s"
-
-#~ msgid "Conversation Log"
-#~ msgstr "Conversation Log"
-
-#~ msgid "Registering account"
-#~ msgstr "Registering account"
-
-#, fuzzy
-#~ msgid "Respond"
-#~ msgstr "Reason:"
-
-#, fuzzy
-#~ msgid "Add to _favourites"
-#~ msgstr "_Add to Favourites"
-
-#, fuzzy
-#~ msgid ""
-#~ "Customize your own nickname, the server and chatroom which you wish to "
-#~ "join."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#, fuzzy
-#~ msgid "Na_me:"
-#~ msgstr "Name:"
-
-#, fuzzy
-#~ msgid "New Chat Room"
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Pick a saved chat room from the presets available below and click Join to "
-#~ "start chatting."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b>Information requested, please wait...</b>"
-#~ msgstr "<b>Information requested, please wait...</b>"
-
-#, fuzzy
-#~ msgid "<span size=\"smaller\">Example:</span>"
-#~ msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
-
-#~ msgid "Account Name"
-#~ msgstr "Account Name"
-
-#, fuzzy
-#~ msgid "Chat Rooms..."
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid "Connection Details"
-#~ msgstr "Connection"
-
-#~ msgid "Do you already have an account set up on a server?"
-#~ msgstr "Do you already have an account set up on a server?"
-
-#, fuzzy
-#~ msgid "Enter the port used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Enter the server used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Enter the user's contact ID:"
-#~ msgstr "Enter the user's contact ID:"
-
-#~ msgid "Finished"
-#~ msgstr "Finished"
-
-#~ msgid "Gossip"
-#~ msgstr "Gossip"
-
-#~ msgid ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favorite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-#~ msgstr ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favourite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-
-#~ msgid ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-#~ msgstr ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-
-#~ msgid "In which group do you want to place this contact?"
-#~ msgstr "In which group do you want to place this contact?"
+#: ../src/empathy-event-manager.c:523
+msgid "Incoming video call"
+msgstr "Incoming video call"
 
-#~ msgid "Jabber ID:"
-#~ msgstr "Jabber ID:"
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+msgid "Incoming call"
+msgstr "Incoming call"
 
-#~ msgid "Nickname:"
-#~ msgstr "Nickname:"
+#: ../src/empathy-event-manager.c:527
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s is video calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-event-manager.c:528
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s is calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Press Subscribe to request to receive their status"
-#~ msgstr "Press Subscribe to request to receive their status."
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Incoming call from %s"
 
-#, fuzzy
-#~ msgid "Registering Account"
-#~ msgstr "Registering account"
+#: ../src/empathy-event-manager.c:556
+msgid "_Reject"
+msgstr "_Reject"
 
-#, fuzzy
-#~ msgid "Resource:"
-#~ msgstr "R_esource:"
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+msgid "_Answer"
+msgstr "_Answer"
 
-#~ msgid "Sending request"
-#~ msgstr "Sending request"
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "_Answer with video"
 
-#, fuzzy
-#~ msgid "Server:"
-#~ msgstr "_Server:"
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Incoming video call from %s"
 
-#~ msgid "Web Site:"
-#~ msgstr "Web Site:"
+#: ../src/empathy-event-manager.c:838
+msgid "Room invitation"
+msgstr "Room invitation"
 
-#~ msgid "Welcome to Gossip"
-#~ msgstr "Welcome to Gossip"
+#: ../src/empathy-event-manager.c:840
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitation to join %s"
 
-#~ msgid "What instant messaging system does the contact use?"
-#~ msgstr "Which instant messaging system does the contact use?"
+#: ../src/empathy-event-manager.c:847
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s is inviting you to join %s"
 
-#~ msgid "What is your name?"
-#~ msgstr "What is your name?"
+#: ../src/empathy-event-manager.c:855
+msgid "_Decline"
+msgstr "_Decline"
 
-#, fuzzy
-#~ msgid "What password do you want to use?"
-#~ msgstr "What server do you want to use?"
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Join"
+msgstr "_Join"
 
-#~ msgid "What username do you use?"
-#~ msgstr "What username do you use?"
+#: ../src/empathy-event-manager.c:887
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s invited you to join %s"
 
-#~ msgid "What username do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-event-manager.c:893
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "You have been invited to join %s"
 
-#~ msgid "Which account do you want to add this contact to?"
-#~ msgstr "To which account do you want to add this contact?"
+#: ../src/empathy-event-manager.c:944
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Incoming file transfer from %s"
 
-#~ msgid ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
-#~ msgstr ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
+msgid "Password required"
+msgstr "Password required"
 
-#~ msgid "Your Account"
-#~ msgstr "Your Account"
+#: ../src/empathy-event-manager.c:1217
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s would like permission to see when you are online"
 
-#~ msgid "Your Identity"
-#~ msgstr "Your Identity"
+#: ../src/empathy-event-manager.c:1223
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Message: %s"
 
-#~ msgid "Your new account has now been set up."
-#~ msgstr "Your new account has now been set up."
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:99
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
 
-#, fuzzy
-#~ msgid "_Group Chat"
-#~ msgstr "Gossip - Chat"
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:102
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
 
-#~ msgid "_No"
-#~ msgstr "_No"
+#: ../src/empathy-ft-manager.c:178
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Unknown"
 
-#~ msgid "_Search..."
-#~ msgstr "_Search..."
+#: ../src/empathy-ft-manager.c:273
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s of %s at %s/s"
 
-#~ msgid "_Yes"
-#~ msgstr "_Yes"
+#: ../src/empathy-ft-manager.c:274
+#, c-format
+msgid "%s of %s"
+msgstr "%s of %s"
 
-#~ msgid "Be silent when away"
-#~ msgstr "Be silent when away"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:305
+#, c-format
+msgid "Receiving \"%s\" from %s"
+msgstr "Receiving \"%s\" from %s"
 
-#~ msgid "Be silent when busy"
-#~ msgstr "Be silent when busy"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:308
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "Sending \"%s\" to %s"
 
-#~ msgid "Height of main window"
-#~ msgstr "Height of main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:338
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Error receiving \"%s\" from %s"
 
-#~ msgid "The X position of the main window."
-#~ msgstr "The X position of the main window."
+#: ../src/empathy-ft-manager.c:341
+msgid "Error receiving a file"
+msgstr "Error receiving a file"
 
-#~ msgid "The Y position of the main window."
-#~ msgstr "The Y position of the main window."
+#: ../src/empathy-ft-manager.c:346
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Error sending \"%s\" to %s"
 
-#~ msgid "The width of the main window."
-#~ msgstr "The width of the main window."
+#: ../src/empathy-ft-manager.c:349
+msgid "Error sending a file"
+msgstr "Error sending a file"
 
-#~ msgid "Whether spell checking should be turned on."
-#~ msgstr "Whether spell checking should be enabled."
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:488
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "\"%s\" received from %s"
 
-#~ msgid "Width of the main window"
-#~ msgstr "Width of the main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:493
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" sent to %s"
 
-#~ msgid "X position of main window"
-#~ msgstr "X position of main window"
+#: ../src/empathy-ft-manager.c:496
+msgid "File transfer completed"
+msgstr "File transfer completed"
 
-#~ msgid "Y position of main window"
-#~ msgstr "Y position of main window"
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+msgid "Waiting for the other participant's response"
+msgstr "Waiting for the other participant's response"
 
-#~ msgid "Gossip, Instant Messaging Client"
-#~ msgstr "Gossip, Instant Messaging Client"
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "Checking integrity of \"%s\""
 
-#, fuzzy
-#~ msgid "Close this chat window"
-#~ msgstr "_Invite to Chat Room"
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#, c-format
+msgid "Hashing \"%s\""
+msgstr "Hashing \"%s\""
 
-#~ msgid "Requested Information"
-#~ msgstr "Requested Information"
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
 
-#~ msgid "/_Invite to Chat Conference"
-#~ msgstr "/_Invite to Chat Conference"
+#: ../src/empathy-ft-manager.c:1037
+msgid "File"
+msgstr "File"
 
-#, fuzzy
-#~ msgid "Send Message"
-#~ msgstr "_New Message..."
+#: ../src/empathy-ft-manager.c:1059
+msgid "Remaining"
+msgstr "Remaining"
 
-#, fuzzy
-#~ msgid "%s has gone offline"
-#~ msgstr "%s went offline"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "File Transfers"
 
-#~ msgid "Contact _Information"
-#~ msgstr "Contact _Information"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "Remove completed, cancellled and failed file transfers from the list"
 
-#~ msgid "<b>Sound</b>"
-#~ msgstr "<b>Sound</b>"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
 
-#~ msgid "Check spelling while I _type"
-#~ msgstr "Check spelling while I _type"
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Import Accounts"
 
-#~ msgid "Gossip - Accounts"
-#~ msgstr "Gossip - Accounts"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:315
+msgid "Import"
+msgstr "Import"
 
-#, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Join Group Chat..."
+#: ../src/empathy-import-widget.c:324
+msgid "Protocol"
+msgstr "Protocol"
 
-#~ msgid "Por_t:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-import-widget.c:348
+msgid "Source"
+msgstr "Source"
 
-#~ msgid "Requested information."
-#~ msgstr "Requested information."
+#: ../src/empathy-roster-window.c:389
+msgid "Provide Password"
+msgstr "Provide Password"
 
-#~ msgid "Requesting contact information, please wait..."
-#~ msgstr "Requesting contact information, please wait..."
+#: ../src/empathy-roster-window.c:395
+msgid "Disconnect"
+msgstr "Disconnect"
 
-#~ msgid "Could not open connection"
-#~ msgstr "Could not open connection"
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
 
-#~ msgid "Could not find the server you wanted to use"
-#~ msgstr "Could not find the server you wanted to use"
+#: ../src/empathy-roster-window.c:660
+msgid "No match found"
+msgstr "No match found"
 
-#~ msgid "Connection to the server failed."
-#~ msgstr "Connection to the server failed."
+#: ../src/empathy-roster-window.c:765
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
 
-#~ msgid "Authentication failed"
-#~ msgstr "Authentication failed"
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "Update software..."
 
-#~ msgid "Written by:"
-#~ msgstr "Written by:"
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "Close"
 
-#~ msgid "Artwork by:"
-#~ msgstr "Artwork by:"
+#: ../src/empathy-roster-window.c:942
+msgid "Reconnect"
+msgstr "Reconnect"
 
-#~ msgid "Translated by:"
-#~ msgstr "Translated by:"
+#: ../src/empathy-roster-window.c:948
+msgid "Edit Account"
+msgstr "Edit Account"
 
-#~ msgid "Account ID"
-#~ msgstr "Account ID"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Top up %s (%s)..."
 
-#~ msgid "Last Error"
-#~ msgstr "Last Error"
+#: ../src/empathy-roster-window.c:1138
+msgid "Top up account credit"
+msgstr "Top up account credit"
 
-#~ msgid "%sChat - %s"
-#~ msgstr "%sChat - %s"
+#. top up button
+#: ../src/empathy-roster-window.c:1210
+msgid "Top Up..."
+msgstr "Top Up..."
 
-#~ msgid "/Show _Log"
-#~ msgstr "/Show _Log"
+#: ../src/empathy-roster-window.c:1933
+msgid "Contact"
+msgstr "Contact"
 
-#~ msgid "Afrikaans"
-#~ msgstr "Afrikaans"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
 
-#~ msgid "Amharic"
-#~ msgstr "Amharic"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "You need to enable %s to see contacts here."
 
-#~ msgid "Arabic"
-#~ msgstr "Arabic"
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "Contact List"
 
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijani"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
 
-#~ msgid "Belarusian"
-#~ msgstr "Belarusian"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
 
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgarian"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Search for Contacts…"
 
-#~ msgid "Breton"
-#~ msgstr "Breton"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
 
-#~ msgid "Bosnian"
-#~ msgstr "Bosnian"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
 
-#~ msgid "Catalan"
-#~ msgstr "Catalan"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
 
-#~ msgid "Czech"
-#~ msgstr "Czech"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
 
-#~ msgid "Welsh"
-#~ msgstr "Welsh"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
 
-#~ msgid "Danish"
-#~ msgstr "Danish"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#~ msgid "German"
-#~ msgstr "German"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
 
-#~ msgid "German (Austria)"
-#~ msgstr "German (Austria)"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "P_references"
 
-#~ msgid "German (Germany)"
-#~ msgstr "German (Germany)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
 
-#~ msgid "German (Swiss)"
-#~ msgstr "German (Swiss)"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Sort by _Name"
 
-#~ msgid "Greek"
-#~ msgstr "Greek"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Sort by _Status"
 
-#~ msgid "English"
-#~ msgstr "English"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
 
-#~ msgid "English (Canadian)"
-#~ msgstr "English (Canadian)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
 
-#~ msgid "English (British)"
-#~ msgstr "English (British)"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Compact Size"
 
-#~ msgid "English (American)"
-#~ msgstr "English (American)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
 
-#~ msgid "Esperanto"
-#~ msgstr "Esperanto"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Join…"
 
-#~ msgid "Spanish"
-#~ msgstr "Spanish"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#~ msgid "Estonian"
-#~ msgstr "Estonian"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
 
-#~ msgid "Persian"
-#~ msgstr "Persian"
+#: ../src/empathy-new-chatroom-dialog.c:369
+msgid "Chat Room"
+msgstr "Chat Room"
 
-#~ msgid "Finnish"
-#~ msgstr "Finnish"
+#: ../src/empathy-new-chatroom-dialog.c:385
+msgid "Members"
+msgstr "Members"
 
-#~ msgid "French"
-#~ msgstr "French"
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:637
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
 
-#~ msgid "French (France)"
-#~ msgstr "French (France)"
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "No"
+msgstr "No"
 
-#~ msgid "French (Swiss)"
-#~ msgstr "French (Swiss)"
+#: ../src/empathy-new-chatroom-dialog.c:668
+msgid "Could not start room listing"
+msgstr "Could not start room listing"
 
-#~ msgid "Irish Gaelic"
-#~ msgstr "Irish Gaelic"
+#: ../src/empathy-new-chatroom-dialog.c:678
+msgid "Could not stop room listing"
+msgstr "Could not stop room listing"
 
-#~ msgid "Scots Gaelic"
-#~ msgstr "Scots Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
 
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Enter the room name to join here or click on one or more rooms in the list."
 
-#~ msgid "Manx Gaelic"
-#~ msgstr "Manx Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
 
-#~ msgid "Hebrew"
-#~ msgstr "Hebrew"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
 
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
 
-#~ msgid "Croatian"
-#~ msgstr "Croatian"
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "Room List"
+msgstr "Room List"
 
-#~ msgid "Hungarian"
-#~ msgstr "Hungarian"
+#: ../src/empathy-preferences.c:166
+msgid "Message received"
+msgstr "Message received"
 
-#~ msgid "Indonesian"
-#~ msgstr "Indonesian"
+#: ../src/empathy-preferences.c:167
+msgid "Message sent"
+msgstr "Message sent"
 
-#~ msgid "Icelandic"
-#~ msgstr "Icelandic"
+#: ../src/empathy-preferences.c:168
+msgid "New conversation"
+msgstr "New conversation"
 
-#~ msgid "Italian"
-#~ msgstr "Italian"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
 
-#~ msgid "Japanese"
-#~ msgstr "Japanese"
+#: ../src/empathy-preferences.c:170
+msgid "Contact goes offline"
+msgstr "Contact goes offline"
 
-#~ msgid "Georgian"
-#~ msgstr "Georgian"
+#: ../src/empathy-preferences.c:171
+msgid "Account connected"
+msgstr "Account connected"
 
-#~ msgid "Kannada"
-#~ msgstr "Kannada"
+#: ../src/empathy-preferences.c:172
+msgid "Account disconnected"
+msgstr "Account disconnected"
 
-#~ msgid "Korean"
-#~ msgstr "Korean"
+#: ../src/empathy-preferences.c:475
+msgid "Language"
+msgstr "Language"
 
-#~ msgid "Kurdish"
-#~ msgstr "Kurdish"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "Juliet has disconnected"
+
+#: ../src/empathy-preferences.c:1159
+msgid "Preferences"
+msgstr "Preferences"
 
-#~ msgid "Cornish"
-#~ msgstr "Cornish"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
 
-#~ msgid "Limburgish"
-#~ msgstr "Limburgish"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
 
-#~ msgid "Lithuanian"
-#~ msgstr "Lithuanian"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Appearance"
+msgstr "Appearance"
 
-#~ msgid "Latvian"
-#~ msgstr "Latvian"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
 
-#~ msgid "Maori"
-#~ msgstr "Maori"
+#: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "new ta_bs"
 
-#~ msgid "Macedonian"
-#~ msgstr "Macedonian"
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "new _windows"
 
-#~ msgid "Malayalam"
-#~ msgstr "Malayalam"
+#: ../src/empathy-preferences.ui.h:7
+msgid "Display incoming events in the notification area"
+msgstr "Display incoming events in the notification area"
 
-#~ msgid "Mongolian"
-#~ msgstr "Mongolian"
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
 
-#~ msgid "Marathi"
-#~ msgstr "Marathi"
+#: ../src/empathy-preferences.ui.h:9
+msgid "Log conversations"
+msgstr "Log conversations"
 
-#~ msgid "Malay"
-#~ msgstr "Malay"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "Behaviour"
 
-#~ msgid "Norwegian (Bokmal)"
-#~ msgstr "Norwegian (Bokmal)"
+#: ../src/empathy-preferences.ui.h:11
+msgid "General"
+msgstr "General"
 
-#~ msgid "Nepali"
-#~ msgstr "Nepali"
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
 
-#~ msgid "Dutch"
-#~ msgstr "Dutch"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
 
-#~ msgid "Norwegian"
-#~ msgstr "Norwegian"
+#: ../src/empathy-preferences.ui.h:14
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
 
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norwegian (Nynorsk)"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
 
-#~ msgid "Norwegian (Nyorsk)"
-#~ msgstr "Norwegian (Nyorsk)"
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
 
-#~ msgid "Oriya"
-#~ msgstr "Oriya"
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
 
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
 
-#~ msgid "Polish"
-#~ msgstr "Polish"
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
 
-#~ msgid "Portuguese"
-#~ msgstr "Portuguese"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Play sound for events"
+msgstr "Play sound for events"
 
-#~ msgid "Portuguese (Portugal)"
-#~ msgstr "Portuguese (Portugal)"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
 
-#~ msgid "Portuguese (Brazil)"
-#~ msgstr "Portuguese (Brazil)"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellllation to improve call quality"
 
-#~ msgid "Romanian"
-#~ msgstr "Romanian"
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Echo cancellllation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo "
+"cancellllation off and restarting the call."
 
-#~ msgid "Russian"
-#~ msgstr "Russian"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
-#~ msgid "Kinyarwanda"
-#~ msgstr "Kinyarwanda"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 
-#~ msgid "Slovak"
-#~ msgstr "Slovak"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Reduce location accuracy"
+msgstr "_Reduce location accuracy"
 
-#~ msgid "Slovenian"
-#~ msgstr "Slovenian"
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "Privacy"
 
-#~ msgid "Albanian"
-#~ msgstr "Albanian"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
 
-#~ msgid "Serbian"
-#~ msgstr "Serbian"
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "_Cellphone"
 
-#~ msgid "Swedish"
-#~ msgstr "Swedish"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
 
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
 
-#~ msgid "Telugu"
-#~ msgstr "Telugu"
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 
-#~ msgid "Thai"
-#~ msgstr "Thai"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
 
-#~ msgid "Turkmen"
-#~ msgstr "Turkmen"
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
-#~ msgid "Turkish"
-#~ msgstr "Turkish"
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#~ msgid "Vietnamese"
-#~ msgstr "Vietnamese"
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Themes"
 
-#~ msgid "Wallon"
-#~ msgstr "Wallon"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Status"
 
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Quit"
 
-#~ msgid "Yiddish"
-#~ msgstr "Yiddish"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "Redial"
 
-#~ msgid "Chinese Simplified"
-#~ msgstr "Chinese Simplified"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#~ msgid "Chinese Traditional"
-#~ msgstr "Chinese Traditional"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
 
-#~ msgid "View Lo_g"
-#~ msgstr "View Lo_g"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "Video Preview"
 
-#, fuzzy
-#~ msgid "Gossip - Chat Rooms"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "Video On"
 
-#~ msgid "Gossip - Group Chat"
-#~ msgstr "Gossip - Group Chat"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
 
-#, fuzzy
-#~ msgid "Gossip - New Chatroom"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "Camera Off"
 
-#~ msgid "Gossip - Add contact"
-#~ msgstr "Gossip - Add contact"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
 
-#~ msgid "Gossip - Contact Information"
-#~ msgstr "Gossip - Contact Information"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
 
-#~ msgid "Gossip - Edit Groups"
-#~ msgstr "Gossip - Edit Groups"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
 
-#~ msgid "Gossip - New Account"
-#~ msgstr "Gossip - New Account"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
 
-#~ msgid "Gossip - New Message"
-#~ msgstr "Gossip - New Message"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
 
-#~ msgid "Gossip - Personal Details"
-#~ msgstr "Gossip - Personal Details"
+#: ../src/empathy-map-view.c:471
+msgid "Contact Map View"
+msgstr "Contact Map View"
 
-#~ msgid "Gossip - Preferences"
-#~ msgstr "Gossip - Preferences"
+#: ../src/empathy-debug-window.c:1228
+msgid "Save"
+msgstr "Save"
 
-#~ msgid "Gossip - Spell Checker"
-#~ msgstr "Gossip - Spell Checker"
+#: ../src/empathy-debug-window.c:1435
+msgid "Debug Window"
+msgstr "Debug Window"
 
-#~ msgid "Gossip - Status Message"
-#~ msgstr "Gossip - Status Message"
+#: ../src/empathy-debug-window.c:1517
+msgid "Pause"
+msgstr "Pause"
 
-#~ msgid "Waiting for server to respond, please wait..."
-#~ msgstr "Waiting for server to respond; please wait..."
+#: ../src/empathy-debug-window.c:1529
+msgid "Level "
+msgstr "Level "
 
-#~ msgid "Connection could not be created"
-#~ msgstr "Connection could not be created"
+#: ../src/empathy-debug-window.c:1549
+msgid "Debug"
+msgstr "Debug"
 
-#~ msgid "Redirect"
-#~ msgstr "Redirect"
+#: ../src/empathy-debug-window.c:1555
+msgid "Info"
+msgstr "Info"
 
-#~ msgid "Bad Request"
-#~ msgstr "Bad Request"
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+msgid "Message"
+msgstr "Message"
 
-#~ msgid "Not Authorized"
-#~ msgstr "Not Authorized"
+#: ../src/empathy-debug-window.c:1567
+msgid "Warning"
+msgstr "Warning"
 
-#~ msgid "Payment Required"
-#~ msgstr "Payment Required"
+#: ../src/empathy-debug-window.c:1573
+msgid "Critical"
+msgstr "Critical"
 
-#~ msgid "Forbidden"
-#~ msgstr "Forbidden"
+#: ../src/empathy-debug-window.c:1579
+msgid "Error"
+msgstr "Error"
 
-#~ msgid "Not Found"
-#~ msgstr "Not Found"
+#: ../src/empathy-debug-window.c:1598
+msgid "Time"
+msgstr "Time"
 
-#~ msgid "Not Allowed"
-#~ msgstr "Not Allowed"
+#: ../src/empathy-debug-window.c:1601
+msgid "Domain"
+msgstr "Domain"
 
-#~ msgid "Not Acceptable"
-#~ msgstr "Not Acceptable"
+#: ../src/empathy-debug-window.c:1603
+msgid "Category"
+msgstr "Category"
 
-#~ msgid "Request Timeout"
-#~ msgstr "Request Timeout"
+#: ../src/empathy-debug-window.c:1605
+msgid "Level"
+msgstr "Level"
 
-#~ msgid "Conflict"
-#~ msgstr "Conflict"
+#: ../src/empathy-debug-window.c:1642
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 
-#~ msgid "Not Implemented"
-#~ msgstr "Not Implemented"
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
+msgid "Invite Participant"
+msgstr "Invite Participant"
 
-#~ msgid "Remote Server Error"
-#~ msgstr "Remote Server Error"
+#: ../src/empathy-invite-participant-dialog.c:201
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Choose a contact to invite into the conversation:"
 
-#~ msgid "Unknown error."
-#~ msgstr "Unknown error."
+#: ../src/empathy-invite-participant-dialog.c:224
+msgid "Invite"
+msgstr "Invite"
 
-#~ msgid "Custom"
-#~ msgstr "Custom"
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "Don't display any dialogs; do any work (eg, importing) and exit"
 
-#~ msgid "The chat room you are trying is not responding."
-#~ msgstr "The chat room you are trying is not responding."
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 
-#~ msgid "Check your details and try again."
-#~ msgstr "Check your details and try again."
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "Show account assistant"
+
+#: ../src/empathy-accounts.c:202
+msgid "- Empathy Accounts"
+msgstr "- Empathy Accounts"
+
+#: ../src/empathy-accounts.c:238
+msgid "Empathy Accounts"
+msgstr "Empathy Accounts"
+
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Show a particular service"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy Debugger"
+
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy Debugger"
+
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
+msgid "Reject"
+msgstr "Reject"
+
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
+msgid "Answer"
+msgstr "Answer"
+
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "Answer with video"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
+msgid "Accept"
+msgstr "Accept"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:247
+msgid "Provide"
+msgstr "Provide"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s just tried to call you, but you were in another call."
 
-#~ msgid "This is currently unsupported."
-#~ msgstr "This is currently unsupported."
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+msgid "i"
+msgstr "i"
 
-#~ msgid "Perhaps the conference server is busy, try again later."
-#~ msgstr "Perhaps the conference server is busy; try again later."
+#: ../src/empathy-call-window.c:2929
+msgid "On hold"
+msgstr "On hold"
 
-#~ msgid "Check the server host name is correct and is available."
-#~ msgstr "Check the server host name is correct and is available."
+#: ../src/empathy-call-window.c:2932
+msgid "Mute"
+msgstr "Mute"
 
-#~ msgid "Gossip will now try to use your account:"
-#~ msgstr "Gossip will now try to use your account:"
+#: ../src/empathy-call-window.c:2934
+msgid "Duration"
+msgstr "Duration"
 
-#~ msgid "Gossip will now try to register the account:"
-#~ msgstr "Gossip will now try to register the account:"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2937
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#~ msgid "Cus_tomize"
-#~ msgstr "Cus_tomize"
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
 
-#~ msgid "Edit or Delete this favorite."
-#~ msgstr "Edit or Delete this favourite."
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
 
-#~ msgid "Gossip - Join Chat Room "
-#~ msgstr "Gossip - Join Chat Room "
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr "Top Up"
 
-#~ msgid "Choose a Server"
-#~ msgstr "Choose a Server"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match case"
 
-#~ msgid "On what server do you have an account?"
-#~ msgstr "On what server do you have an account?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5da43e26e..6da0e7d11 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2006 Empathy's COPYRIGHT HOLDER
 # This file is distributed under the same licence as the empathy package.
 # David Lodge <dave@cirt.net>, 2007, 2009.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-16 14:46+0100\n"
-"PO-Revision-Date: 2011-10-16 14:47+0100\n"
+"POT-Creation-Date: 2012-03-09 13:39+0000\n"
+"PO-Revision-Date: 2012-03-09 13:43+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -17,506 +17,558 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-rc1\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy Internet Messaging"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM Client"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Call volume, as a percentage."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Camera device"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Camera position"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Chat window theme"
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Chat window theme variant"
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magic number used to check if sanity cleaning tasks should be run"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Compact contact list"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Connection managers should be used"
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Contact list sort criterion"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Show avatars"
+msgstr "Show avatars"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Default directory to select an avatar image from"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Disable popup notifications when away"
+msgid "Show protocols"
+msgstr "Show protocols"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Disable sounds when away"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Display incoming events in the status area"
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Echo cancellation support"
+msgid "Compact contact list"
+msgstr "Compact contact list"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy can publish the user's location"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy can use the GPS to guess the location"
+msgid "Hide main window"
+msgstr "Hide main window"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy can use the mobile phone network to guess the location"
+msgid "Hide the main window."
+msgstr "Hide the main window."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy can use the network to guess the location"
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy default download folder"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy has migrated butterfly logs"
+msgid "Open new chats in separate windows"
+msgstr "Open new chats in separate windows"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy should auto-away when idle"
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy should auto-connect on startup"
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy should reduce the location's accuracy"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy should use the avatar of the contact as the chat window icon"
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Enable WebKit Developer Tools"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Enable popup notifications for new messages"
+msgid "Show contact groups"
+msgstr "Show contact groups"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Enable spell checker"
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Hide main window"
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Hide the main window."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort the "
+"contact list by name."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Nick completed character"
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Open new chats in separate windows"
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Path of the Adium theme to use"
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Play a sound for new conversations"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Play a sound when a contact logs in"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Play a sound when a contact logs out"
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Play a sound when we log in"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Play a sound when we log out"
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pop up notifications if the chat isn't focused"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pop up notifications when a contact logs in"
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pop up notifications when a contact logs out"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Position the camera preview should be during a call."
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Show Balance in contact list"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Show avatars"
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Show contact list in rooms"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Show hint about closing the main window"
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Show protocols"
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "The default folder to save file transfers in."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "The last directory that an avatar image was chosen from."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "The position for the chat window side pane"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "The stored position (in pixels) of the chat window side pane."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Use theme for chat rooms"
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Whether Empathy can publish the user's location to their contacts."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Whether Empathy can use the GPS to guess the location."
+msgid "Chat window theme"
+msgstr "Chat window theme"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Whether Empathy can use the mobile phone network to guess the location."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Whether Empathy can use the network to guess the location."
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Whether Empathy has migrated butterfly logs."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Whether Empathy should automatically log into your accounts on startup."
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Whether to convert smileys into graphical images in conversations."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Whether to enable Pulseaudio's echo cancellation filter."
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Whether to play a sound to notify of contacts logging into the network."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Whether to play a sound to notify of events."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Whether to play a sound to notify of incoming messages."
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Whether to play a sound to notify of new conversations."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Whether to play a sound to notify of outgoing messages."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Whether to play a sound when logging into a network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Whether to play a sound when logging out of a network."
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialogue"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Whether to show a popup notification when a contact goes offline."
+msgid "Camera device"
+msgstr "Camera device"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+msgid "Camera position"
+msgstr "Camera position"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Whether to show a popup notification when receiving a new message."
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Whether to show account balances in the contact list."
+msgid "Echo cancellation support"
+msgstr "Echo cancellation support"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Whether to show contacts that are offline in the contact list."
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Whether to show the message dialogue about closing the main window with the "
+"'x' button in the title bar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Whether to show protocols for contacts in the contact list."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Whether to show the contact list in chat rooms."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Whether to show the contact list in compact mode."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Whether to show the message dialogue about closing the main window with the "
-"'x' button in the title bar."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Whether to use the theme for chat rooms."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the mobile phone network to guess the location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Whether Empathy can use the mobile phone network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Manage Messaging and VoIP accounts"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "No reason was specified"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Messaging and VoIP Accounts"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "You cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "File transfer completed, but the file was corrupted"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "File transfer not supported by remote contact"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "The selected file is not a regular file"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "The selected file is empty"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Missed call from %s"
@@ -532,170 +584,139 @@ msgstr "Called %s"
 msgid "Call from %s"
 msgstr "Call from %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Socket type not supported"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "No reason was specified"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "The change in state was requested"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "You cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "The other participant cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Error while trying to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "The other participant is unable to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Available"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Away"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status is set to offline"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Network error"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Encryption error"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Name in use"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificate not provided"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificate untrusted"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificate expired"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificate not activated"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certificate hostname mismatch"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificate self-signed"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certificate error"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Encryption is not available"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certificate is invalid"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Connection has been refused"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Connection can't be established"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Connection has been lost"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Connection has been replaced by a new connection using the same resource"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "The account already exists on the server"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certificate has been revoked"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certificate uses an insecure cypher algorithm or is cryptographically weak"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -703,283 +724,262 @@ msgstr ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day ago"
 msgstr[1] "%d days ago"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d month ago"
 msgstr[1] "%d months ago"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "in the future"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "All accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "My Web Accounts"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "The account %s is edited via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "The account %s cannot be edited in Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Launch My Web Accounts"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Edit %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Username:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pply"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_og in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "This account already exists on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Create a new account on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Ca_ncel"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "New account"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Example:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Advanced"
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Remember Password"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Remember password"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Screen _Name:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "What is your AIM password?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "What is your AIM screen name?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Example:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Login I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "What is your GroupWise User ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "What is your GroupWise password?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Example:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Ch_aracter set:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "What is your ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "What is your ICQ password?"
 
@@ -1016,11 +1016,23 @@ msgstr "Options"
 msgid "None"
 msgstr "None"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Character set:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1028,14 +1040,6 @@ msgstr ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Network"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Network:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nickname:"
@@ -1052,48 +1056,20 @@ msgstr "Quit message:"
 msgid "Real name:"
 msgstr "Real name:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servers"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "What is your IRC nickname?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Example:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Example:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Encr_yption required (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnore SSL certificate errors"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Override server settings"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Reso_urce:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1105,179 +1081,203 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
 "Facebook username if you don't have one."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Use old SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "What is your Facebook password?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "What is your Facebook username?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "What is your Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "What is your Google password?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Reso_urce:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "What is your Jabber password?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_mail address:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_First Name:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Last Name:"
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Example:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Authentication username:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Discover Binding"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Discover the STUN server automatically"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignore TLS Errors"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Interval (seconds)"
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive Options"
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routeing"
+msgid "STUN Server:"
+msgstr "STUN Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Miscellaneous Options"
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal Options"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanism:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy Options"
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN Server:"
+msgid "Loose Routing"
+msgstr "Loose Routeing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Use this account to call _landlines and mobile phones"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "What is your SIP account password?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "What is your SIP login ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Username:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnore conference and chat room invitations"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "What is your Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "What is your Yahoo! password?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Room List locale:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1315,61 +1315,65 @@ msgstr "All Files"
 msgid "Click to enlarge"
 msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "There was an error starting the call"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "The specified contact doesn't support calls"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "The specified contact is offline"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "The specified contact is not valid"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Emergency calls are not supported on this protocol"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� is not a valid contact ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: clear all messages from the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: set the topic of the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1377,23 +1381,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1403,11 +1407,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1415,113 +1419,126 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Usage: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unknown command; see /help for the available commands"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "insufficient balance to send message"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "not capable"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "invalid contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permission denied"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "too long message"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "not implemented"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Error sending message '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Error sending message: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "No topic defined"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(No Suggestions)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Add '%s' to Dictionary"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s has disconnected"
@@ -1529,12 +1546,12 @@ msgstr "%s has disconnected"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s was kicked"
@@ -1542,17 +1559,17 @@ msgstr "%s was kicked"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s was banned"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s has left the room"
@@ -1562,17 +1579,17 @@ msgstr "%s has left the room"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s has joined the room"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
@@ -1580,90 +1597,90 @@ msgstr "%s is now known as %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Would you like to store this password?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Remember"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Not now"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Retry"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Wrong password; please try again:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "This room is protected by a password:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Join"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversation"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Unknown or invalid identifier"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Contact blocking temporarily unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Contact blocking unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Permission Denied"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Could not block contact"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Edit Blocked Contacts"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Account:"
 
@@ -1673,463 +1690,368 @@ msgstr "Blocked Contacts"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Remove"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Open Link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Edit Contact Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personal Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "New Contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Are you sure you want to block '%s' from contacting you again?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Block"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Report this contact as abusive"
 msgstr[1] "_Report these contacts as abusive"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decide _Later"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Subscription Request"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Block User"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ungrouped"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favourite People"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Do you really want to remove the group '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Removing group"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Do you really want to remove the contact '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Removing contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Add Contact…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Block Contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Previous Conversations"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send File"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Share My Desktop"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favourite"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mation"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviting you to this room"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Search contacts"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Search: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Add Contact"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "No contacts found"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Your message introducing yourself:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Select a contact"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Full name:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Phone number:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail address:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Website:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Birthday:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Last seen:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Connected from:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Away message:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Channels:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Country ISO Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Country:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "County:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "City:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postal Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Street:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Building:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Floor:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Room:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Description:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Accuracy Level:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertical Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontal Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Bearing:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Climb Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Last Updated on:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Location"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Save Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Unable to save avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Location</b> at (date)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Client Information"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Client:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Contact Details"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifier:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Information requested…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Groups"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2137,105 +2059,170 @@ msgstr ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Add Group"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Select"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Group"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "The following identity will be blocked:"
 msgstr[1] "The following identities will be blocked:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "The following identity can not be blocked:"
 msgstr[1] "The following identities can not be blocked:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linked Contacts"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Select contacts to link"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "New contact preview"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Contacts selected in the list on the left will be linked together."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Select account to use to place the call"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Call"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Work"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HOME"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mation"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edit"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Link Contacts…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Delete and _Block"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Removing group"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2244,7 +2231,11 @@ msgstr ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Removing contact"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2255,23 +2246,23 @@ msgstr[1] "Linked contacts containing %u contacts"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Location</b> at (date)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Online from a phone or mobile device"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "New Network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Choose an IRC network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Reset _Networks List"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Select"
@@ -2284,249 +2275,251 @@ msgstr "new server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Link Contacts"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Unlink…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Completely split the displayed linked contacts into the separate contacts."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Link"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Unlink linked contacts '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Unlink"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "History"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Show"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Search"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat with %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s second"
 msgstr[1] "%s seconds"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minute"
 msgstr[1] "%s minutes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Call took %s, ended at %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Today"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Anytime"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Anyone"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Who"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "When"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Anything"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Text chats"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Incoming calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Outgoing calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Missed calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "What"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Are you sure you want to delete all logs of previous conversations?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Clear All"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Delete from:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Loading…</span>"
+msgid "_File"
+msgstr "_File"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Delete All History…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profile"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_File"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "page 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Contact ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Enter a contact identifier or phone number:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "New Conversation"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _Video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video Call"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "C_all"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio Call"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "New Call"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentication failed for account <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2563,12 +2556,8 @@ msgstr "Click to make this status a favourite"
 msgid "Set status"
 msgstr "Set status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Set your presence and current status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Custom messages…"
 
@@ -2576,7 +2565,7 @@ msgstr "Custom messages…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "New %s account"
@@ -2586,20 +2575,20 @@ msgid "Find:"
 msgstr "Find:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_ch case"
+msgid "_Previous"
+msgstr "_Previous"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Phrase not found"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Next"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Previous"
+msgid "Phrase not found"
+msgstr "Phrase not found"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2645,12 +2634,12 @@ msgstr "Voice call ended"
 msgid "Edit Custom Messages"
 msgstr "Edit Custom Messages"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Message edited at %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2728,34 +2717,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certificate hostname: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continue"
+msgid "C_ontinue"
+msgstr "C_ontinue"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Remember this choice for future connections"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certificate Details"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Unable to open URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Insufficient free space to save file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2764,7 +2757,7 @@ msgstr ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Incoming file from %s"
@@ -2936,39 +2929,31 @@ msgstr "Western"
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "The selected contact cannot receive files."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "The selected contact is offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "No error message"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Don't connect on startup"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Don't display the contact list or any other dialogues on startup"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM Client"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Error contacting the Account Manager"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3015,233 +3000,94 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "An Instant Messaging client for GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "David Lodge <dave@cirt.net>\n"
 "Philip Withnall <philip@tecnocode.co.uk>\n"
 "Bruce Cowan <bruce@bcowan.me.uk>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "There was an error while importing the accounts."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "There was an error while parsing the account details."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "There was an error while creating the account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "There was an error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "The error message was: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "An error occurred"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "What kind of chat account do you have?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Do you have any other chat accounts you want to set up?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enter your account details"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "What kind of chat account do you want to create?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Do you want to create other chat accounts?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enter the details for the new account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Do you have an account you've been using with another chat program?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Yes, import my account details from "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Yes, I'll enter my account details now"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, I want a new account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, I just want to see people online nearby for now"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Select the accounts you want to import:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Yes"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "No, that's all for now"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialogue"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Edit->Accounts"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "I do _not want to enable this feature for now"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialogue"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut not installed"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Messaging and VoIP Accounts Assistant"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Welcome to Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Import your existing accounts"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Please enter personal details"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "There are unsaved modifications to your %s account."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Your new account has not been saved yet."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Connecting…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnected — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Offline — No Network Connection"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Unknown Status"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Offline — Account Disabled"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parameters"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parameters…"
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Do you want to remove %s from your computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "This will not remove your account on the server."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,15 +3096,23 @@ msgstr ""
 "your changes. Are you sure you want to proceed?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Skip"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3270,19 +3124,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Add…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Loading account information"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No protocol installed"
+msgid "_Import…"
+msgstr "_Import…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Loading account information"
+msgstr "Loading account information"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3290,132 +3140,116 @@ msgstr ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Import…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No protocol backends installed"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy authentication client"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy authentication client"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "People nearby"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Audio/Video Client"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Audio/Video Client"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brightness"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Sidebar"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio input"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video input"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Dialpad"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Details"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Call with %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "The IP address as seen by the machine"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "The IP address as seen by a server on the Internet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "The IP address of the peer as seen by the other side"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "The IP address of a relay server"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "The IP address of the multicast group"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connected — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Technical Details"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3424,8 +3258,8 @@ msgstr ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3434,8 +3268,8 @@ msgstr ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3444,27 +3278,27 @@ msgstr ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "There was a failure on the network"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "The audio formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "The video formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3475,262 +3309,311 @@ msgstr ""
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "There was a failure in the call engine"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "The end of the stream was reached"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Can't establish audio stream"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Can't establish video stream"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Call"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Decoding Codec:"
+msgid "_Microphone"
+msgstr "_Microphone"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Disable camera"
+msgid "_Camera"
+msgstr "_Camera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Display the dialpad"
+msgid "_Settings"
+msgstr "_Settings"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Encoding Codec:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_View"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Hang up"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Help"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Hang up current call"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Contents"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Local Candidate:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximise me"
+msgid "Swap camera"
+msgstr "Swap camera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimise me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Remote Candidate:"
+msgid "Maximise me"
+msgstr "Maximise me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send Audio"
+msgid "Disable camera"
+msgstr "Disable camera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Send Video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Show dialpad"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Start a video call"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Start an audio call"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Swap camera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Toggle audio transmission"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Toggle video transmission"
+msgid "Show dialpad"
+msgstr "Show dialpad"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Unknown"
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video call"
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Call"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Camera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Contents"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Debug"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Help"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Microphone"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Settings"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_View"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Close window"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Leave room"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d unread)"
 msgstr[1] "%s (%d unread)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (and %u other)"
 msgstr[1] "%s (and %u others)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d unread from others)"
 msgstr[1] "%s (%d unread from others)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d unread from all)"
 msgstr[1] "%s (%d unread from all)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sending %d message"
 msgstr[1] "Sending %d messages"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Typing a message."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "C_lear"
+msgid "_Conversation"
+msgstr "_Conversation"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontact"
+msgid "C_lear"
+msgstr "C_lear"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insert _Smiley"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invite _Participant…"
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notify for All Messages"
+msgid "C_ontact"
+msgstr "C_ontact"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversation"
+msgid "_Tabs"
+msgstr "_Tabs"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favourite Chat Room"
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Undo Close Tab"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3744,100 +3627,100 @@ msgstr "Room"
 msgid "Auto-Connect"
 msgstr "Auto-Connect"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Manage Favourite Rooms"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Incoming video call"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Incoming call"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s is video calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s is calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Incoming call from %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Answer"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Answer with video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Incoming video call from %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Room invitation"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation to join %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s is inviting you to join %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Join"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invited you to join %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "You have been invited to join %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Incoming file transfer from %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Password required"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s would like permission to see when you are online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3847,105 +3730,105 @@ msgstr ""
 "Message: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s of %s at %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s of %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Receiving \"%s\" from %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sending \"%s\" to %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Error receiving \"%s\" from %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Error receiving a file"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Error sending \"%s\" to %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Error sending a file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" received from %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sent to %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Waiting for the other participant's response"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Checking integrity of \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Remaining"
 
@@ -3957,7 +3840,11 @@ msgstr "File Transfers"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove completed, cancelled and failed file transfers from the list"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Import"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3965,171 +3852,195 @@ msgstr ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Import Accounts"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Provide Password"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "No match found"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Update software…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Close"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconnect"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Edit Account"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Close"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Top up %s (%s)…"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Top up account credit"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Top Up…"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "You need to enable %s to see contacts here."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contacts on a _Map"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Credit Balance"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Find in Contact _List"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Join _Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Search for Contacts…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Manage Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal Size"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "New _Call…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal Size With _Avatars"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_references"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Show P_rotocols"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sort by _Name"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sort by _Status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blocked Contacts"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Compact Size"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_File Transfers"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Join…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_New Conversation…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Offline Contacts"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personal Information"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Room"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Search for Contacts…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chat Room"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Members"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4142,22 +4053,27 @@ msgstr ""
 "Password required: %s\n"
 "Members: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Could not start room listing"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Could not stop room listing"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Couldn't load room list"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4166,6 +4082,10 @@ msgstr ""
 "Enter the room name to join here or click on one or more rooms in the list."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4173,378 +4093,395 @@ msgstr ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Join Room"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Room List"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Room:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Message received"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Message sent"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "New conversation"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Contact goes offline"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Account connected"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Account disconnected"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Language"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Juliet has disconnected"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferences"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Behaviour"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chat Th_eme:"
+msgid "new ta_bs"
+msgstr "new ta_bs"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Disable notifications when _away or busy"
+msgid "new _windows"
+msgstr "new _windows"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Disable sounds when _away or busy"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Display incoming events in the notification area"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
+msgid "Log conversations"
+msgstr "Log conversations"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Enable notifications when a contact comes online"
+msgid "Behavior"
+msgstr "Behaviour"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Enable notifications when a contact goes offline"
+msgid "General"
+msgstr "General"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Enable notifications when the _chat is not focused"
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Enable spell checking for languages:"
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Input level:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Input volume:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Location sources:"
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Log conversations"
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Play sound for events"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacy"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellation to improve call quality"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"county and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Show _smileys as images"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Show contact _list in rooms"
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sounds"
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Spell Checking"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"county and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Themes"
+msgid "_Reduce location accuracy"
+msgstr "_Reduce location accuracy"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Use _echo cancellation to improve call quality"
+msgid "Privacy"
+msgstr "Privacy"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_Automatically connect on startup"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Mobile phone"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "_Enable bubble notifications"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Network (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publish location to my contacts"
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "_Reduce location accuracy"
+msgid "Themes"
+msgstr "Themes"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Call the contact again"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Camera Off"
+msgid "Redial"
+msgstr "Redial"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Camera On"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disable camera and stop sending video"
+msgid "Video Preview"
+msgstr "Video Preview"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enable camera and send video"
+msgid "Video On"
+msgstr "Video On"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enable camera but don't send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Preview"
+msgid "Camera Off"
+msgstr "Camera Off"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Redial"
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Off"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video On"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Preview"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Save"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin link"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin response"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Data too large for a single paste. Please save logs to file."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Send to pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Level "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Message"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Critical"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Time"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domain"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Category"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Level"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4552,131 +4489,428 @@ msgstr ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invite Participant"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Choose a contact to invite into the conversation:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invite"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Don't display any dialogues unless there are only \"People Nearby\" accounts"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy Accounts"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy Accounts"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Show a particular service"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy Debugger"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy Debugger"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy Chat Client"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respond"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Reject"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Answer"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Answer with video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Decline"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Accept"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Provide"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s just tried to call you, but you were in another call."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "On hold"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mute"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duration"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Top Up"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Match case"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "People nearby"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+
+#~ msgid "Call volume"
+#~ msgstr "Call volume"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Call volume, as a percentage."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy has migrated butterfly logs"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Whether Empathy has migrated butterfly logs."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket type not supported"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "My Web Accounts"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "The account %s is edited via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "The account %s cannot be edited in Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Launch My Web Accounts"
+
+#~ msgid "Edit %s"
+#~ msgstr "Edit %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncel"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personal Information"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ungrouped"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favourite People"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Select a contact"
+#~ msgstr "Select a contact"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Linked Contacts"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Select contacts to link"
+
+#~ msgid "New contact preview"
+#~ msgstr "New contact preview"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Contacts selected in the list on the left will be linked together."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Link Contacts…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Link Contacts"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Unlink…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+
+#~ msgid "_Link"
+#~ msgstr "_Link"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Unlink linked contacts '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Unlink"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Contact ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _Video"
+
+#~ msgid "C_all"
+#~ msgstr "C_all"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Set your presence and current status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "The selected contact cannot receive files."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "The selected contact is offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "There was an error while importing the accounts."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "There was an error while parsing the account details."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "There was an error while creating the account."
+
+#~ msgid "There was an error."
+#~ msgstr "There was an error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "The error message was: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+
+#~ msgid "An error occurred"
+#~ msgstr "An error occurred"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Do you have any other chat accounts you want to set up?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Enter your account details"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "What kind of chat account do you want to create?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Do you want to create other chat accounts?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Enter the details for the new account"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Do you have an account you've been using with another chat program?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Yes, import my account details from "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Yes, I'll enter my account details now"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, I want a new account"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, I just want to see people online nearby for now"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Select the accounts you want to import:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, that's all for now"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Edit->Accounts"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "I do _not want to enable this feature for now"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialogue"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Messaging and VoIP Accounts Assistant"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Welcome to Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Import your existing accounts"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Please enter personal details"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personal Information"
+
+#~ msgid "Input level:"
+#~ msgstr "Input level:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Input volume:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Open new chats in separate windows"
+
 #~ msgid "All"
 #~ msgstr "All"
 
@@ -4851,9 +5085,6 @@ msgstr "_Match case"
 #~ msgid "Hidden"
 #~ msgstr "Hidden"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "User requested disconnect"
-
 #~ msgid "_Add Contact..."
 #~ msgstr "_Add Contact…"
 
@@ -5278,9 +5509,6 @@ msgstr "_Match case"
 #~ msgid "View previous conversations with this contact"
 #~ msgstr "View previous conversations with this contact"
 
-#~ msgid "Start a voice or video conversation with this contact"
-#~ msgstr "Start a voice or video conversation with this contact"
-
 #~ msgid "Invalid handle"
 #~ msgstr "Invalid handle"
 
@@ -5326,9 +5554,6 @@ msgstr "_Match case"
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_Use for chat rooms"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "ICQ account settings"
-
 #~ msgid "irc account settings"
 #~ msgstr "irc account settings"
 
diff --git a/po/eo.po b/po/eo.po
index 30ac8814a..6709d829a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,553 +1,573 @@
 # Esperanto translation for Empathy.
-# Copyright (C) 2004-2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Brient HESS <brient@brient.net>, 2004.
 # Aisano, Eliovir, ISHII Eiju, Javier Lancha, Kvantumo, Lucas LARSON, Michael MORONI, Petr Adam DOHN�LEK, Robert BOGENSCHNEIDER, Serge LEBLANC, Shane D, Yamiharu.
 # Neil ROBERTS < >, 2011.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-04 18:19+0000\n"
-"PO-Revision-Date: 2011-10-09 07:59+0200\n"
+"POT-Creation-Date: 2012-03-10 22:08+0000\n"
+"PO-Revision-Date: 2012-03-11 11:26+0100\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Launchpad-Export-Date: 2012-03-10 23:48+0000\n"
+"X-Generator: Launchpad (build 14914)\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Launchpad (build 13037)\n"
-"X-Launchpad-Export-Date: 2011-05-14 18:39+0000\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Retbabilo per Google Talk, Viza�libro, MSN kaj multaj aliaj servoj"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empatio"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Tujmesa�ilo"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empatio ret-mesa�ado"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Tujmesa�ilo"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Retbabilo per Google Talk, Viza�libro, MSN kaj multaj aliaj servoj"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Babilaj kaj VoIP-kontoj"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Administri babilaj kaj VoIP-kontojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
+msgid "Connection managers should be used"
+msgstr "Konekto-administrilo estu uzata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-#| msgid "Call from %s"
-msgid "Call volume"
-msgstr "Voko-laÅ­teco"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "Ĉu uzi konekteco-administoloj por aŭtomate malkonekti/rekonekti?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "AÅ­tomata konekto dum la startigo de Empatio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Camera On"
-msgid "Camera device"
-msgstr "Filmila aparato"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ĉu Empatio aŭtomate konekti�u al via kontoj dum startigo?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#| msgid "Camera On"
-msgid "Camera position"
-msgstr "Filmila pazicio"
+msgid "Empathy should auto-away when idle"
+msgstr "Ka�i Empation aŭtomate kiam senokupe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en grupbabilejo."
+"Ĉu Empatio aŭtomate �an�o al forestanta re�imo se la uzanto estas neokupite?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Babil-fenestra etoso"
+msgid "Empathy default download folder"
+msgstr "Defaŭlta el�utujo de Empatio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Variaĵo de babil-fenestra etoso"
+msgid "The default folder to save file transfers in."
+msgstr "La defaÅ­lta dosierujo por konservi ricevitajn dosierojn."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
-"fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Kompakta listo de kontaktuloj"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Konekto-administrilo estu uzata"
+msgid "Show offline contacts"
+msgstr "Montri malkonektitulojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kontaktlista ordigkriterio"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ĉu montri nekonektatajn kontaktoj en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
+msgid "Show avatars"
+msgstr "Montri uzantobildojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "DefaÅ­lta dosierujo por elekto de uzantobildo"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Ĉu montri uzantobildojn por kontaktoj en la kontaktaro kaj la "
+"babilejfenestroj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "El�alti �prucfenestro-sciigojn dum foresto"
+msgid "Show protocols"
+msgstr "Montri protokolojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Malaktivigi sonon kiam fora"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ĉu montri protokolojn de kontaktoj en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Montri envenantajn eventojn en la statusa areo"
+msgid "Show Balance in contact list"
+msgstr "Montri bilancon en la kontaktaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
-"al la uzanto tuj."
+msgid "Whether to show account balances in the contact list."
+msgstr "Ĉu montri la konto-bilancon en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr ""
+msgid "Compact contact list"
+msgstr "Kompakta listo de kontaktuloj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empatio povas publikigi la lokon de la uzanto"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ĉu montri la kontaktaron en kompakta re�imo?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
+msgid "Hide main window"
+msgstr "Ka�i ĉeffenestron"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
+msgid "Hide the main window."
+msgstr "Ka�i la ĉefan fenestron."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empatio rajtas uzi la reton por diveni la lokon"
+msgid "Default directory to select an avatar image from"
+msgstr "DefaÅ­lta dosierujo por elekto de uzantobildo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Defaŭlta el�utujo de Empatio"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "La lasta dosierujo el kie estis elektita uzantobildon."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empatio translokis papiliajn spurojn"
+msgid "Open new chats in separate windows"
+msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Ka�i Empation aŭtomate kiam senokupe"
+msgid "Always open a separate chat window for new chats."
+msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "AÅ­tomata konekto dum la startigo de Empatio"
+msgid "Display incoming events in the status area"
+msgstr "Montri envenantajn eventojn en la statusa areo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empatio devas redukti la precizon pri la loko"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
+"al la uzanto tuj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
-"babilo-fenestro"
+msgid "The position for the chat window side pane"
+msgstr "La loko por la flanka babilfenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "En�alti evoluigantilojn de WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "En�alti �prucfenestro-sciigojn pri novaj mesa�oj"
+msgid "Show contact groups"
+msgstr "Montri kontakt-grupojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "En�alti literumadan kontrolilon"
+msgid "Whether to show groups in the contact list."
+msgstr "Ĉu montri grupojn en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Ka�i ĉeffenestron"
+msgid "Contact list sort criterion"
+msgstr "Kontaktlista ordigkriterio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Ka�i la ĉefan fenestron."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr ""
+msgid "Use notification sounds"
+msgstr "Uzi atentig-sonojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
+msgid "Whether to play a sound to notify of events."
+msgstr "Ĉu ludi sonon por sciigi pri eventoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Pado de la uzenda etoso por Adium"
+msgid "Disable sounds when away"
+msgstr "Malaktivigi sonon kiam fora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ĉu ludi sonajn sciigojn kiam oni estas for aŭ okupi�ata?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Ludi sonon pro alvenintaj mesa�oj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Ludi sonon pro novaj babiloj"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ĉu ludi sonon por averti pro alvenintaj mesa�oj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Ludi sonon pro elirantaj mesa�oj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Ludi sonon kiam kontaktulo ensalutas"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ĉu ludi sonon por averti pro elirantaj mesa�oj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Ludi sonon kiam kontaktulo elsalutas"
+msgid "Play a sound for new conversations"
+msgstr "Ludi sonon pro novaj babiloj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Ludi sonon kiam ni ensalutas"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ĉu ludi sonon por averti pro novaj konversacioj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Ludi sonon kiam ni elsalutas"
+msgid "Play a sound when a contact logs in"
+msgstr "Ludi sonon kiam kontaktulo ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Åœprucfenestri sciigojn se la babilejo ne estas fokusite"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ĉu ludi sonon por sciigi pri kontaktoj kiuj ensalutas en reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Åœprucfenestri sciigojn kiam kontaktulo ensalutas"
+msgid "Play a sound when a contact logs out"
+msgstr "Ludi sonon kiam kontaktulo elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Åœprucfenestri sciigojn kiam kontaktulo elsalutas"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ĉu ludi sonon por sciigi pri kontaktoj kiuj elsalutas de reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Play a sound when we log in"
+msgstr "Ludi sonon kiam ni ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Show offline contacts"
-msgid "Show Balance in contact list"
-msgstr "Montri malkonektitulojn"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ĉu ludi sonon dum ensaluto en nova reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Montri avatarojn"
+msgid "Play a sound when we log out"
+msgstr "Ludi sonon kiam ni elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Montri kontakto-liston per ĉambroj"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ĉu ludi sonon dum elsaluto de reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
+msgid "Enable popup notifications for new messages"
+msgstr "En�alti �prucfenestrajn sciigojn pri novaj mesa�oj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Montri malkonektitulojn"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Ĉu montri �prucfenestrajn sciigojn pri ricevo de novaj mesa�oj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Montri protokolojn"
+msgid "Disable popup notifications when away"
+msgstr "El�alti �prucfenestro-sciigojn dum foresto"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Literum-kontrolataj lingvoj"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Ĉu montri �prucfenestrajn sciigojn kiam oni estas for aŭ okupi�atas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "La defaÅ­lta dosierujo por konservi ricevitajn dosierojn."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Åœprucfenestri sciigojn se la babilejo ne estas fokusite"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "La lasta dosierujo el kie estis elektita avataron."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ĉu montri �prucfenestrajn sciigojn kiam novaj mesa�oj alvenas eĉ se la "
+"babilejo jam estas malfermita, sed ne havas la fokuson?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "La loko por la flanka babilfenestro"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Åœprucfenestri sciigojn kiam kontaktulo ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Ĉu montri �prucfenestrajn sciigojn kiam kontakto ekkonektas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
-"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Åœprucfenestri sciigoj kiam kontaktulo elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"La variaĵo de etoso, kiu estas uzata por montri la babilon en la "
-"babilejfenestroj."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ĉu montri �prucfenestrajn sciigojn kiam kontakto malkonektas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Uzi grafikajn mienetojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Uzi atentig-sonojn"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Uzi etoson por la babilo-ĉambroj"
+msgid "Show contact list in rooms"
+msgstr "Montri kontakto-liston per ĉambroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ĉu montri kontaktaron en babilejoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
+msgid "Chat window theme"
+msgstr "Babil-fenestra etoso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
+msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
-"Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
-"pozicion?"
+"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
+msgid "Chat window theme variant"
+msgstr "Variaĵo de babil-fenestra etoso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-#, fuzzy
-#| msgid "Empathy has migrated butterfly logs"
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empatio translokis papiliajn spurojn"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variaĵo de etoso, kiu estas uzata por montri la babilon en la "
+"babilejfenestroj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ĉu Empatio aŭtomate konekti�u al via kontoj dum startigo?"
+msgid "Path of the Adium theme to use"
+msgstr "Pado de la uzenda etoso por Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-#, fuzzy
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ĉu Empatio aŭtomate konekti�u al via kontoj dum startigo?"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ĉu Empatio reduktu la precizon de la loko pro privatec-kialoj?"
+msgid "Enable WebKit Developer Tools"
+msgstr "En�alti evoluigantilojn de WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-#, fuzzy
-#| msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
-"babilo-fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgid "Inform other users when you are typing to them"
+msgstr "Informi aliajn uzantojn kiam vi skribas al ili"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
+msgid "Use theme for chat rooms"
+msgstr "Uzi etoson por la babilo-ĉambroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ĉu uzi la etoson por babilejoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Spell checking languages"
+msgstr "Literum-kontrolataj lingvoj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
+"Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
+"fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
+msgid "Enable spell checker"
+msgstr "En�alti literumadan kontrolilon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-#, fuzzy
-#| msgid "Play a sound for incoming messages"
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ludi sonon pro alvenintaj mesa�oj"
+msgid "Nick completed character"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-#, fuzzy
-#| msgid "Play a sound for new conversations"
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ludi sonon pro novaj babiloj"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en grupbabilejo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-#, fuzzy
-#| msgid "Play a sound for outgoing messages"
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ludi sonon pro elirantaj mesa�oj"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
+"babilo-fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Ĉu Empatio uzu la uzantobildon de la kontaktulo kiel piktogramo de la babilo-"
+"fenestro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
+msgid "Last account selected in Join Room dialog"
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-#, fuzzy
-#| msgid "Disable notifications when _away or busy"
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Mal�alti sciigojn kiam oni foras aŭ okupi�as"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-#, fuzzy
-#| msgid "Enable notifications when a contact goes offline"
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Åœalti sciigojn kian kontakto malkonektas"
+msgid "Camera device"
+msgstr "Filmila aparato"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-#, fuzzy
-#| msgid "Enable notifications when a contact comes online"
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Åœalti sciigojn kiam kontakto konektas"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "DefaÅ­lta kamera-aparato por uzi dum video-vokoj, ekz. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
+msgid "Camera position"
+msgstr "Filmila pazicio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-#, fuzzy
-#| msgid "Enable popup notifications for new messages"
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "En�alti �prucfenestro-sciigojn pri novaj mesa�oj"
+msgid "Position the camera preview should be during a call."
+msgstr "Posicio de la kameraa antaÅ­rigardo dum voko."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
+msgid "Echo cancellation support"
+msgstr "EÄ¥o-nuligada supteno"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ĉu en�alti la eĥo-nuligadan filtrilon de Pulseaudio?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
+msgid "Show hint about closing the main window"
+msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-#, fuzzy
-#| msgid "Disable notifications when _away or busy"
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Mal�alti sciigojn kiam oni foras aŭ okupi�as"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
+msgid "Empathy can publish the user's location"
+msgstr "Empatio povas publikigi la lokon de la uzanto"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-#, fuzzy
-#| msgid "Whether to use the theme for chat rooms."
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ĉu uzi la etoson por babilejoj?"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr ""
+msgid "Empathy can use the network to guess the location"
+msgstr "Empatio rajtas uzi la reton por diveni la lokon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ĉu uzi la etoson por babilejoj?"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
+"Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
+"pozicion?"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Administri babilaj kaj VoIP-kontojn"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Babilaj kaj VoIP-kontoj"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empatio devas redukti la precizon pri la loko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Ĉu Empatio reduktu la precizecon de la loko pro privatec-kialoj?"
+
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Neniu kialo estis indikita"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "La �an�o de la stato estis petite"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Vi ĉesis la dosiertransigon"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "La alia partoprenanto ĉesis la dosiertransigon"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Eraro dum provi transigi la dosieron"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "La alia partoprenanto ne povas transigi la dosieron"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nekonata kialo"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "La �utado de la dosiero fini�is, sed la dosiero estis difektita"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Åœutado de dosieroj ne estas subtenata de la fora kontakto"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "La elektita dosiero ne estas regula"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "La elektita dosiero estas malplena"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Maltrafita voko de %s"
@@ -563,169 +583,138 @@ msgstr "Vokis %s"
 msgid "Call from %s"
 msgstr "Voko de %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Ingotipo estas nesubtenata"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Neniu kialo estis indikita"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "La �an�o de la stato estis petite"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Vi ĉesis la dosiertransigon"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "La alia partoprenanto ĉesis la dosiertransigon"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Eraro dum provi transigi la dosieron"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "La alia partoprenanto ne povas transigi la dosieron"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nekonata kialo"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
-msgstr "Disponebla"
+msgstr "Disponeble"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Okupite"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "For"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevideble"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
-msgstr "Malkonektite"
+msgstr "Nekonektite"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Neniu kialo indikita"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stato estas agortite al nekonektite"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Reta eraro"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "AÅ­tentokontrolo fiaskis"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Ĉifrad-eraro"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Jam uzata nomo"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Neniu prezentigita atestilo"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Atestilo nekonfida"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Atestilo eksvalidi�is"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Ne aktivigita atestilo"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Atestogastnomo malkongruas"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Atestilo-fingrospuro malkongruas"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Memkreita atestilo"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Atestil-eraro"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Ĉifrado ne estas diponebla"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Atestilo estas nevalide"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Konekto estas rifuzite"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Ne eblas starigi la konekton"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdis konekton"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ĉi tiu rimedo jam konekti�is al la servilo"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Tiu konto jam estas konektite al la servilo"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "La konekto anstataŭi�is per nova konekto uzanta la saman rimedon"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "La konto jam ekzistas sur la servilo"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "La servilo tro okupi�as por trakti la konekton"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "La atestilo senvalidi�is"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "La atestilo uzas nesekuran ĉifralgoritmon aŭ estas kriptografie malforta"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -733,283 +722,262 @@ msgstr ""
 "La longeco de la atestilo de la servilo, aŭ la profundeco de la ĉeno de la "
 "atestilo, superas la limojn faratajn de la kriptografia biblioteko"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Via programaro estas tro maljuna"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Interna eraro"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Proksimaj homoj"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Japana Yahoo!"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-babilejo"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "AntaÅ­ %d sekundo"
 msgstr[1] "AntaÅ­ %d sekundoj"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "AntaÅ­ %d minuto"
 msgstr[1] "AntaÅ­ %d minutoj"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "AntaÅ­ %d horo"
 msgstr[1] "AntaÅ­ %d horoj"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "AntaÅ­ %d tago"
 msgstr[1] "AntaÅ­ %d tagoj"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "AntaÅ­ %d semajno"
 msgstr[1] "AntaÅ­ %d semajnoj"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "AntaÅ­ %d monato"
 msgstr[1] "AntaÅ­ %d monatoj"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "en la estonteco"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Miaj surretaj _kontoj"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "La konto %s redakti�as per %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Ne eblas redakti la konton %s per Empatio."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Lanĉi miajn surretajn kontojn"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Redakti %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Uzantonomo:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pliki"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "E_nsaluti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Tiu konto jam ekzistas sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Krei novan konton sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Nuligi"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ĉe %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nova konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Ekzemplo:</b> MiaNomo"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pas_vorto:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Altnivele"
+msgid "Screen _Name:"
+msgstr "Ekran_nomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Ekzemplo:</b> MiaNomo"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Memori pasvorton"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Memori la pasvorton"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Pordo:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Memori pasvorton"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Ekran_nomo:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servilo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Kio estas via AIM-pasvorto?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Altnivele"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Kio estas via AIM-nomo?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Pordo:"
+msgid "What is your AIM password?"
+msgstr "Kio estas via AIM-pasvorto?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servilo:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Ekzemplo:</b> uzantonomo"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Memori la pasvorton"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Ensalut-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Ekzemplo:</b> uzantonomo"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Kio estas via uzantidentigilo ĉe GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Kio estas via pasvorto ĉe GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ĉe ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Ekzemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Sign_a agordo:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ĉe ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Kio estas via UIN ĉe ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Kio estas via ICQ-pasvorto?"
 
@@ -1046,11 +1014,23 @@ msgstr "Agordoj"
 msgid "None"
 msgstr "Neniu"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Reto"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Reto:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Signa agordo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serviloj"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1058,14 +1038,6 @@ msgstr ""
 "Plej multaj el la serviloj de IRC ne bezonas pasvorton, do se vi ne certas, "
 "ne enmetu pasvorton."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Reto"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Reto:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Kromnomo:"
@@ -1082,48 +1054,20 @@ msgstr "Ĉeso-mesa�o:"
 msgid "Real name:"
 msgstr "Reala nomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serviloj"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Kio estas via kromnomon ĉe IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kiu IRC-reto?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Ekzemplo:</b> uzanto@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Ekzemplo:</b> uzanto@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Ĉ_ifrado nepras (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnori erarojn de atestiloj de SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Superskribi agordojn de la servilo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_tato:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Kio estas via kromnomon ĉe IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ris_urco:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Kio estas via uzantonomo ĉe Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1133,181 +1077,205 @@ msgstr ""
 "Ĉi tio estas via uzantonomo, ne via kutima ensaluto ĉe Facebook.\n"
 "Se vi nomi�as facebook.com/<b>zizelo</b>, enmetu <b>zizelo</b>.\n"
 "Uzu <a href=\\\"http://www.facebook.com/username/\\\">ĉi tiu pa�o</a> por "
-"elekti uzantnomon ĉe Facebook se vi ne jam havas."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Uzi malnovan SS_L"
+"elekti uzantonomon ĉe Facebook se vi ne jam havas."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Kio estas via pasvorto ĉe Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Kio estas via uzantnomo ĉe Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Kio estas via identigilo ĉe Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Ekzemplo:</b> uzanto@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Kio estas via pasvorto ĉe Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Ekzemplo:</b> uzanto@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnori erarojn de atestiloj de SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_tato:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ris_urco:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Ĉ_ifrado nepras (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Uzi malnovan SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Superskribi agordojn de la servilo"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Kio estas via identigilo ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Kio estas via pasvorto ĉe Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Kiun identigilon vi deziras ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Kio estas via pasvorto ĉe Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Kiun pasvorton vi deziras ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Ekzemplo:</b> uzanto@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Kio estas via identigilo ĉe Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Kio estas via pasvorto ĉe Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Ret_po�tadreso:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Kromnomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Familia nomo:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Persona nomo:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Montrata nomo:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Familia nomo:"
+msgid "E-_mail address:"
+msgstr "Ret_po�tadreso:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Montrata nomo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Uzantonomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Ekzemplo:</b> uzanto@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Aŭtentig-uzantonomo:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Eltrovi bindaĵon"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Eltrovi la servilon de STUN aÅ­tomate"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uzi ĉi tiun konton por voki _fiskajn kaj po�ajn telefonojn"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignori erarojn de TLS"
+msgid "NAT Traversal Options"
+msgstr "Agordoj por transiro de NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (sekundoj)"
+msgid "Proxy Options"
+msgstr "Prokuril-agordoj"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Agordoj de vivodaÅ­rigo"
+msgid "Miscellaneous Options"
+msgstr "Diversaj agordoj"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Malstrikta enkursigo"
+msgid "STUN Server:"
+msgstr "STUN-servilo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Eltrovi la servilon de STUN aÅ­tomate"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Diversaj agordoj"
+msgid "Discover Binding"
+msgstr "Eltrovi bindaĵon"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Agordoj por transiro de NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servilo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Agordoj de vivodaÅ­rigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Pordo:"
+msgid "Mechanism:"
+msgstr "Mekanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Prokuril-agordoj"
+msgid "Interval (seconds)"
+msgstr "Intervalo (sekundoj)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "AÅ­tentig-uzantonomo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-servilo:"
+msgid "Loose Routing"
+msgstr "Malstrikta enkursigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Servilo:"
+msgid "Ignore TLS Errors"
+msgstr "Ignori erarojn de TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporto:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Uzi ĉi tiun konton por voki _fiskajn kaj po�ajn telefonojn"
+msgid "Port:"
+msgstr "Pordo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Kio estas via pasvorto por via konto de SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kio estas via ensalut-identigilo de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Uzantonomo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Kio estas via pasvorto por via konto de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnori konferencajn kaj babilejajn invitojn"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Lokaĵaro por la ĉambrolisto:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Kio estas via identigilo ĉe Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Kio estas via pasvorto ĉe Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Lokaĵaro por la ĉambrolisto:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1323,7 +1291,7 @@ msgstr "Malsukcesis konservi la bildon en dosieron"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
-msgstr "Elekti bildon por via avataro"
+msgstr "Elekti bildon por via uzantobildo"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
@@ -1345,61 +1313,65 @@ msgstr "Ĉiuj dosieroj"
 msgid "Click to enlarge"
 msgstr "Klaku por pligrandigi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Okazis eraro dum komenci la vokon"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "La indikita kontakto ne subtenas vokojn"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "La indikita kontakto estas malkonektita"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "La indikita atestilo nevalidas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Krizajn vokojn ne subtenas ĉi tiu protokolo"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Via kredito ne sufiĉas por fari tiun vokon"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Malsukcesis malfermi privatan babilejon"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Ĉi tiu konversacio ne subtenas temojn"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Vi ne rajtas �an�i la temon"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ne estas valida identigo de kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Vakigi ĉiujn mesa�ojn el la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temo>: Åœangi la temon de la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1407,24 +1379,24 @@ msgstr ""
 "/part [<ID de babil-ĉambro>] [<kialo>]: forlasi la babil-ĉambron, defaŭlte "
 "la aktualan"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID de kontakto> [<mesa�o>]: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID de kontakto> <mesa�o>: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kromnomo>: Ŝan�i vian kromnomon ĉe la aktuala servilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <mesa�o>: sendi mesa�on de “ACTION� (ago) al la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1434,11 +1406,11 @@ msgstr ""
 "tion por sendi mesa�on kiu komencas per ‘/’. Ekzemple: “/say /join uzi�as "
 "por eniri ĉambrojn�"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID de kontakto>: montri informon pri kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1446,113 +1418,127 @@ msgstr ""
 "/help [<komando>]: montri ĉiujn subtenatajn komandojn. Se <komando> estas "
 "difinita, montri �ian uzon."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uzo: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nekonata komando"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nekonata komando; vidu /help por la uzeblaj komandoj"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "kredito ne sufiĉas por sendi la mesa�on"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Eraris sendi mesa�on ‘%s’: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Eraro dum sendo de mesa�o: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"bilanco ne sufiĉas por sendi la mesa�on. <a href='%s'>Plenumi konton</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ne kapablas"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nekonektite"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nevalida kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "tro longa mesa�o"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ne realigite"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nekonate"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Eraris sendi mesa�on ‘%s’: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Eraro dum sendo de mesa�o: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temo:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "La temo �an�i�is al: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "La temo �an�i�is de %s al: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Neniu temo estas definita"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Neniuj proponoj)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aldoni '%s' al vortaro"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aldoni '%s' al %s vortaro"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Enmeti miensimbolon"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Sendi"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Literumadaj proponoj"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Malsukcesis akiri la ĵusajn protokolojn"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s malkonekti�is"
@@ -1560,12 +1546,12 @@ msgstr "%s malkonekti�is"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s estas forpelita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s estas forpelita"
@@ -1573,17 +1559,17 @@ msgstr "%s estas forpelita"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s estas ekzilita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s estas ekzilita"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s forlasis la ĉambron"
@@ -1593,17 +1579,17 @@ msgstr "%s forlasis la ĉambron"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ali�is la ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nun estas konata kiel %s"
@@ -1611,90 +1597,90 @@ msgstr "%s nun estas konata kiel %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Malkonektite"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Ĉu vi volas konservi ĉi tiun pasvorton?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Memorigi"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne nun"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reprovi"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Mal�usta pasvorto; bonvolu reprovi:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Pasvorto gardas ĉi tiun ĉambron:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Ali�i"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Konektite"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Konversacio"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nekonata aÅ­ nevalida identigilo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktblokado portempe ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Kontaktblokado ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Malsukcesis bloki kontakton"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redakti blokitajn kontaktojn"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1704,464 +1690,369 @@ msgstr "Blokitaj kontaktoj"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Forigi"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopii la ligiladreson"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Malfermi la ligil_on"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redakti kontakto-informojn"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personaj informoj"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nova kontakto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Ĉu bloki na %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Ĉu vi certas ke vi volas bloki ‘%s’ de kontakti vin plu?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Raporti ĉi tiun kontakton kiel mistraktema"
 msgstr[1] "_Raporti ĉi tiujn kontaktojn kiel mistraktemaj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidi _poste"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Abonpeto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloki uzanton"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupite"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Legosignitaj homoj"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ĉu vi vere volas forigi la grupon ‘%s’?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Forigi grupon"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "Fo_rigi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ĉu vi vere volas forigi la kontakton ‘%s’?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Forigi kontakton"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Aldoni kontakton…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Bloki kontakton"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Babilejo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Sonalvoko"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videoalvoko"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_AntaÅ­aj konversacioj"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Sendi dosieron"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Komunigi mian labortabelon"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Librosigno"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_edakti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Invitas vin al tiu ĉi ĉambro"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Inviti al babil-ĉambro"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidi _poste"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Serĉi kontaktojn"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Serĉi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Aldoni kontakton"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ne trovis kontaktojn"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Via mesa�o por enkonduki vin:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Bonvolu permesi min vidi kiam vi konektas. Dankon!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Elekti kontakton"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Tuta nomo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnumero:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Retpo�tadreso:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Retpa�aro:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Naski�tago:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Lasta vido:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Konektite de:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Foresto-mesa�o:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaloj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Landkodo de ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Lando:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Åœtato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Urbo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Areo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Po�tkodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Strato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Konstruaĵo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Eta�o:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Ĉambro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivelo de precizo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Eraro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Rapido:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Direkto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Rapideco de alti�o:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Laste aktualigita je:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Loko"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%ea de %B, %Y je %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
-msgstr "Konservi la avataron"
+msgstr "Konservi la uzantobildon"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
-msgstr "Malsukcesis konservi la avataron"
+msgstr "Malsukcesis konservi la uzantobildon"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Pozicio</b> je (dato)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Kromnomo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientaj informoj"
-
-# babililo = chat-tool
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Kliento:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personaj detaloj"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Kontaktdetaloj"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Tuta nomo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnumero"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Retpo�tadreso"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Retejo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Naski�tago"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Lasta vido:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Konektite de:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Foresto-mesa�o:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "laboro"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hejmo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "po�telefono"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voĉo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferate"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcelo"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identigilo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Kromnomo:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Pozicio</b> je (dato)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Informoj petitaj…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klientaj informoj"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "Mastruma sistemo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+# babililo = chat-tool
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Kliento:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupoj"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2169,105 +2060,171 @@ msgstr ""
 "Elektu la grupojn en kiuj vi volas ke ĉi tiu kontakto aperos. Rimarku ke oni "
 "povas elekti pli ol unu grupo aÅ­ neniom grupoj."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Aldoni grupon"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Elekti"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La jena idento bloki�os:"
 msgstr[1] "La jenaj identoj bloki�os:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Ne eblas bloki la jena idento:"
 msgstr[1] "Ne eblas bloki la jenaj identoj:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Ligitaj kontaktoj"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Elekti kontaktojn por ligi"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "AntaÅ­rigardo de nova kontakto"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontaktoj elektitaj en la maldekstra listo kunligi�os."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redakti kontakto-informojn"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Elekti konton kiun uzi�os por voki"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Voko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Po�telefono"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Laboro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hejmo"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Bloki kontakton"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Babilejo"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Sonalvoko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoalvoko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_AntaÅ­aj konversacioj"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Sendi dosieron"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Komunigi mian labortabelon"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Librosigno"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ne estas instalite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Bonvole instalu la pakaĵon \"gnome-contacts\" por aliri kontakt-detalojn."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edakti"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligi kontaktojn…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Invitas vin al tiu ĉi ĉambro"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Inviti al babil-ĉambro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Aldoni kontakton…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Forvi�i kaj _bloki"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ĉu vi vere volas forigi la grupon ‘%s’?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Forigi grupon"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "Fo_rigi"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ĉu vi vere volas forigi la kontakton ‘%s’?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2276,7 +2233,11 @@ msgstr ""
 "Ĉu vere vi volas forigi la ligitan kontakton ‘%s’? Rimarku ke tio forigos "
 "ĉiujn kontaktojn kiuj ligi�as al ĉi tiu kontakto."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Forigi kontakton"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2287,23 +2248,23 @@ msgstr[1] "Ligitaj kontaktoj enhavantaj %u kontaktoj"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Pozicio</b> je (dato)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Konektita per telefono aÅ­ portebla aparato"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova reto"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Elekti IRC-reton"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "RedefaÅ­ltigi la liston"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Elekti"
@@ -2316,249 +2277,252 @@ msgstr "nova servilo"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligi kontaktojn"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Malligi…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Tute dividi la montratajn ligitajn kontaktojn al apartaj kontaktoj"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligi"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Ĉu malligi la ligitajn kontaktojn ‘%s’?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ĉu vi certas ke vi volas malligi ĉi tiujn ligitajn kontaktojn? Tio tute "
-"dividos la ligitajn kontaktojn al apartaj kontaktoj."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Malligi"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historio"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Montri"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Serĉi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Babili en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Babili kun %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekundo"
 msgstr[1] "%s sekundoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Voko daŭris %s, fini�is je %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "HodiaÅ­"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "HieraÅ­"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Iam ajn"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Iu ajn"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kiu"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kiam"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Io ajn"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Tekstaj babiloj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Venantaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Elirantaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Maltrafitaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kio"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ĉu vi certas ke vi volas forvi�i ĉiujn protokolojn de antaŭaj konversacioj?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Vakigi ĉion"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Forigi de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ŝargante…</span>"
+msgid "_File"
+msgstr "_Dosiero"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Babilejo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "R_edakti"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Forigi la tutan historion..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Babilejo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_edakti"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Dosiero"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "pa�o 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ŝargante…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "La kontakto estas nekonetite"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Babilo"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "La indikita kontakto estas aÅ­ nevalida aÅ­ nekonata"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "La kontakto ne subtenas tiun specon de konversacio"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "La petita trajto ne estas realigita por tiu protokolo."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne eblas komenci konversacion kun la donata kontakto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Vi estas ekzilita de tiu kanalo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "La kanalo estas plena"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Vi estu invitita por ali�i al tiu kanalo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ne eblas procedi dum nekonekto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permeso rifuzita"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Okazis eraro dum komenco de konversacio"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Enigu la identililon aÅ­ la telefonnumeron de la kontakto:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nova konversacio"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Sendi _videon"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Videoalvoko"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Voki"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Sonalvoko"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova voko"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "AÅ­tentokontrolo fiaskis je la konto <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2595,12 +2559,8 @@ msgstr "Klaku por librosigni ĉi tiun staton"
 msgid "Set status"
 msgstr "Agordi staton"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Aktualigi vian ĉeestecon kaj staton"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Kutimaj mesa�oj…"
 
@@ -2608,7 +2568,7 @@ msgstr "Kutimaj mesa�oj…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nova %s konto"
@@ -2618,20 +2578,20 @@ msgid "Find:"
 msgstr "Serĉi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Uskleca _kongruo"
+msgid "_Previous"
+msgstr "_AntaÅ­a"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frazo ne trovita"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Sekva"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Uskleca _kongruo"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_AntaÅ­a"
+msgid "Phrase not found"
+msgstr "Frazo ne trovita"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2677,12 +2637,12 @@ msgstr "Voĉa voko fini�is"
 msgid "Edit Custom Messages"
 msgstr "Redakti kutimajn mesa�ojn"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mesa�o redakti�is je %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normale"
 
@@ -2759,34 +2719,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nomo en la atestilo: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "DaÅ­rigi"
+msgid "C_ontinue"
+msgstr "_DaÅ­rigi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nefidanta konekto"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ĉi tiu konekto ne konfidas. Ĉu vi volus konekti malgraŭ tio?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Memori ĉi tiun elekton por estontaj konektoj"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detaloj de la atestilo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Malsukcesis malfermi la URIon"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Elekti dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Mankas sufiĉa spaco por konservi la dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2795,7 +2759,7 @@ msgstr ""
 "%s da libera spaco necesas por konservi ĉi tiun dosieron, sed nur %s "
 "disponeblas. Bonvolu elekti alian lokon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Venanta dosiero de %s"
@@ -2830,7 +2794,7 @@ msgstr "Kelta"
 #: ../libempathy-gtk/totem-subtitle-encoding.c:187
 #: ../libempathy-gtk/totem-subtitle-encoding.c:189
 msgid "Central European"
-msgstr "MezeÅ­ropa"
+msgstr "MezeÅ­rope"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:192
 #: ../libempathy-gtk/totem-subtitle-encoding.c:194
@@ -2967,39 +2931,31 @@ msgstr "Okcidenta"
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "La elektita kontakto ne povas ricevi dosierojn."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "La elektita kontakto estas senkonektita."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Neniu erarmesa�o"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Tujmesa�o (Empatio)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne konekti dum lanĉo"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne montri la kontaktliston aŭ iun alian dialogon dum lanĉo"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Tujmesa�ilo 'Empatio'"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Eraro dum kontakti la mastrumilon de kontoj"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3032,7 +2988,7 @@ msgid ""
 "details."
 msgstr ""
 "Empatio estas distribuata kun la espero ke �i estas utila, sed SEN IU "
-"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
+"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
 "CELO. Vidu la Äœeneralan Publikan Permesilon de GNU por pli da detaloj."
 
 #: ../src/empathy-about-dialog.c:89
@@ -3043,18 +2999,19 @@ msgid ""
 msgstr ""
 "Vi devintus ricevi kopion de la Äœenerala Publika Permesilo de GNU kun "
 "Empatio; se ne, skribu al Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Tujmesa�ilo por GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Aisano https://launchpad.net/~info-ais-sanmarino\n"
 "  Brient Hess https://launchpad.net/~brient\n"
+"  Diego Souza https://launchpad.net/~diegosouza-br-deactivatedaccount\n"
 "  Eliovir https://launchpad.net/~eliovir\n"
 "  ISHII Eiju https://launchpad.net/~lumidina\n"
 "  Javier Lancha https://launchpad.net/~javierlancha\n"
@@ -3062,230 +3019,90 @@ msgstr ""
 "  Kvantumo https://launchpad.net/~ordnascrazy\n"
 "  Lucas Larson https://launchpad.net/~lucaslarson\n"
 "  Michael Moroni https://launchpad.net/~airon90\n"
-"  Petr Adam Dohnálek https://launchpad.net/~dohnp5a1\n"
+"  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n"
+"  Petrus Adamus https://launchpad.net/~dohnp5a1\n"
 "  Robert BOGENSCHNEIDER https://launchpad.net/~robog\n"
 "  Serge Leblanc https://launchpad.net/~serge-leblanc\n"
+"  Serge Leblanc https://launchpad.net/~serge-leblanc-wanadoo\n"
 "  Shane D https://launchpad.net/~dimensional\n"
 "  Yamiharu https://launchpad.net/~yamiharu84\n"
 "GNOME Contributions:\n"
 "  Neil ROBERTS"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Eraro okazis dum importi la kontojn."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Eraro okazis dum sintakse analizi la detalojn de la konto."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Eraro okazis dum krei la konton."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Okazis eraro."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "La erarmesa�o estis: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Vi povas aÅ­ iri reen kaj reprovi enmeti la detalojn de via konto aÅ­ eliri el "
-"ĉi tiu asistanto kaj aldoni kontojn poste per la menuo ‘Redakti’."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Eraro aperis"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Kian babilkonton vi havas?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ĉu vi havas aliajn babilkontojn kiujn vi volas agordi?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enmetu la detalojn de via konto"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Kian babilkonton vi volas krei?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Ĉu vi volas krei aliajn babilkontojn?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enmetu la detalojn de la nova konto"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Per Empatio oni povas babili kun homoj konektitaj proksime kaj kun amikoj "
-"kaj kolegoj kiu uzas Google Talk, AIM, Windows Live kaj multajn aliajn "
-"babilaplikaĵojn. Per mikrofono aŭ retkamerao oni povas babili ankaŭ sone aŭ "
-"videe."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ĉu vi havas konton kiun vi uzas en alia babilaplikaĵo?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Jes, enportu la detalojn de mia konto el "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Jes, mi enmetos la detalojn de mia konto nun"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ne, mi volas novan konton"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, mi nur volas vidi homojn kiuj estas konektitaj proksime dumtempe"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Elektu la kontojn kiujn vi volas importi:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Jes"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ne, tio sufiĉas nun"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empatio povas aÅ­tomate eltrovi la homojn kiu konektis al la sama reto kiel "
-"vi kaj babili kun ili. Se vi volas uzi ĉi tiun trajton, bonvolu kontroli ĉu "
-"la jenaj detaloj �ustas. Oni povas facile �an�i ĉi tiujn detalojn poste aŭ "
-"el�alti ĉi tiun trajton per uzi la dialogon de ‘Kontoj’."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redakti->Kontoj"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Mi _ne volas en�alti ĉi tiun trajton nun"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Vi ne povos babili kun homoj konektitaj al via proksima reto, ĉar telepathy-"
-"salut ne instali�is. Se vi volas en�alti ĉi tiun trajton, bonvolu instali la "
-"pakaĵon ‘telepathy-salut’ kaj krei konton de proksimaj homoj per la dialogo "
-"de kontoj."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ne instali�is"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistanto por kontoj de mesa�ado kaj VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Bonvenon al Empatio"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importi viajn ekzistajn kontojn"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Bonvolu enmeti viajn personajn detalojn"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Estas nekonservitaj �an�oj al via konto ‘%s’."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Via nova konto ankoraŭ ne konservi�is."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Konektante…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nekonektite — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Nekonektite — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nekonektite — Neniu retkonekto"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nekonata stato"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Nekonektite — Konto estas el�altite"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Redakti konekto-parametrojn"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"Vi estas kreonta novan konton kiu forvi�os\n"
-"vian �an�ojn. Ĉu vi certas ke vi volas daŭri?"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "R_edakti konekto-parametrojn..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ĉu vi volas forigi %s de la komputilo?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ĉi tio ne forigos vian konton ĉe la servilo."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3294,15 +3111,23 @@ msgstr ""
 "viajn �an�ojn. Ĉu vi certas ke vi volas daŭri?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "E_n�alti"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "E_l�alti"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "Preterpa_si"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Konekti"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3314,19 +3139,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Aldoni…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Åœargi kontoinformojn"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Neniu protokolo estas instalita"
+msgid "_Import…"
+msgstr "E_nporti…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokolo:"
+msgid "Loading account information"
+msgstr "Åœargi kontoinformojn"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3334,132 +3155,116 @@ msgstr ""
 "Por aldoni novan konton, oni unue devas instali modulon por ĉiu protokolo "
 "kiun oni volas uzi."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importi…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Neniu protokolo-internaĵo estas instalita"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
-msgstr "- AÅ­tentkontrola kliento de Empathy"
+msgstr " - AÅ­tentkontrola kliento de Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "AÅ­tentkontrola kliento de Empatio"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Proksimaj homoj"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Sona/videa kliento de Empatio"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Sona/videa kliento de Empatio"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrasto"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Heleco"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamo"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "LaÅ­teco"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Flanka breto"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Sonenigo"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Videoenigo"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Ciferplato"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detaloj"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Voko kun %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "La IP-adreso vidata de la ma�ino"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La IP-adreso vidata de servilo ĉe la Interreto"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La IP-adreso de la kliento vidata de la alia flanko"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "La IP-adreso de relajsa servilo"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "La IP-adreso de la plurelsendgroupo"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektite — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Teknikaj detaloj"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3467,8 +3272,8 @@ msgid ""
 msgstr ""
 "La programaro de %s komprenas neniun sonformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3476,8 +3281,8 @@ msgid ""
 msgstr ""
 "La programaro de %s komprenas neniun videformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3486,25 +3291,25 @@ msgstr ""
 "Ne eblas sukcese konekti al %s. Eble unu el vi uzas reton kiu ne permesas "
 "rektajn konektojn."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Okazis paneo je la reto"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "La necesasj sonformoj por ĉi tiu voko ne instali�is ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "La necesaj videoformoj por ĉi tiu voko ne instali�is ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3515,263 +3320,311 @@ msgstr ""
 "ĉi tiun cimon</a> kaj afi�i la protokolojn kiujn oni povas kolekti per la "
 "sencimig-fenestro en la helpmenuo."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Eraro okazis en la vokmodulo"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "La fino de la fluo atingi�is"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ne eblas starigi la sonfluon"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ne eblas starigi la videfluon"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Sono"
+msgid "_Call"
+msgstr "_Voko"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Malkodanta kodeko:"
+msgid "_Microphone"
+msgstr "_Mikrofono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "El�alti la kamaraon"
+msgid "_Camera"
+msgstr "_Filmilo"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Montri la ciferplaton"
+msgid "_Settings"
+msgstr "_Agordoj"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodanta kodeko:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Vido"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Fini vokon"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Helpo"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Fini la aktualan vokon"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Enhavoj"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Loka kandidato:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Sencimigo"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maksimumigi min"
+msgid "Swap camera"
+msgstr "Inter�an�i filmilojn"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimumigi min"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fora kandidato:"
+msgid "Maximise me"
+msgstr "Maksimumigi min"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Sendi sonon"
+msgid "Disable camera"
+msgstr "El�alti la kamaraon"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Sendi videon"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Fini vokon"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Montri la ciferplaton"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Fini la aktualan vokon"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "_Videoalvoko"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Komenci videvokon"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Komenci sonvokon"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Inter�an�i filmilojn"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Baskuligi la sonan transsendon"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Baskuligi la videan transsendon"
+msgid "Show dialpad"
+msgstr "Montri la ciferplaton"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nekonate"
+msgid "Display the dialpad"
+msgstr "Montri la ciferplaton"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Sendi videon"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "_Videoalvoko"
+msgid "Toggle video transmission"
+msgstr "Baskuligi la videan transsendon"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Voko"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Sendi sonon"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Filmilo"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Enhavoj"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Baskuligi la sonan transsendon"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Sencimigo"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodanta kodeko:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Helpo"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Malkodanta kodeko:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofono"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Fora kandidato:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Agordoj"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Loka kandidato:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Vido"
+msgid "Audio"
+msgstr "Sono"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Ĉu fermi la fenestron?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Fermante tiun fenstron vi forlasas na %s. Vi ne ricevos iun venontan mesa�on "
+"�is vi reali�is al �i."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Fermante tiun fenstron vi forlasas babilejon. Vi ne ricevos iun venontan "
+"mesa�on �is vi reali�is al �i."
+msgstr[1] ""
+"Fermante tiun fenstron vi forlasas %u babilejojn. Vi ne ricevos iun venontan "
+"mesa�on �is vi reali�is al �i."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Ĉu forlasi na %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Vi ne ricevos iun venontan mesa�on de tiu babilejo �is vi reali�is al �i."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Fermi la fenestron"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlasi ĉambron"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d nelegite)"
 msgstr[1] "%s (%d nelegite)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (kaj %u alia)"
 msgstr[1] "%s (kaj %u aliaj)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d nelegita de aliaj)"
 msgstr[1] "%s (%d nelegitaj de aliaj)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d nelegita de ĉiuj)"
 msgstr[1] "%s (%d nelegitaj de ĉiuj)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sendante %d mesa�on"
 msgstr[1] "Sendante %d mesa�ojn"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skribante mesa�on."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Vakigi"
+msgid "_Conversation"
+msgstr "_Konversacio"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakto"
+msgid "C_lear"
+msgstr "_Vakigi"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Aldoni _miensimbolon"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Librosignita babilĉambro"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Inviti _partoprenanton…"
+msgid "Notify for All Messages"
+msgstr "Atentigi pri ciuj mesa�oj"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Movi la langeton _maldekstren"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Montri kontaktliston"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Movi la langeton _dekstren"
+msgid "Invite _Participant…"
+msgstr "Inviti _partoprenanton…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Atentigi pri ciuj mesa�oj"
+msgid "C_ontact"
+msgstr "K_ontakto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Konversacio"
+msgid "_Tabs"
+msgstr "_Langetoj"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Malligi langeton"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Librosignita babilĉambro"
-
-#: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "_Sekva langeto"
-
-#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "_AntaÅ­a langeto"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Montri kontaktliston"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Langetoj"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "Sekva la_ngeto"
 
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Undo Close Tab"
 msgstr "_Malfari fermon de langeto"
 
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Movi langeton ma_ldekstren"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Movi langeton maldekst_ren"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Malligi langeton"
+
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nomo"
@@ -3784,100 +3637,100 @@ msgstr "Ĉambro"
 msgid "Auto-Connect"
 msgstr "AÅ­tomata konekto"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
-msgstr "Venanta videotelefon-voko"
+msgstr "Venanta video-voko"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Venanta telefonvoko"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vokas vin videe. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vokas vin. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Venanta voko de %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rifuzi"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Respondo"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Respondi per video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Venenta videvoko de %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Ĉambrinviton"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Inviton por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s invitas vin por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Malakcepti"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Ali�i"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invitis vin por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vi inviti�is por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Venanta dosiertransigo de %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Pasvorto bezonatas"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s volus permeson por scii kiam vi konektas"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3887,105 +3740,105 @@ msgstr ""
 "Mesa�o: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s ĉe %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Ricevante \"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sendante \"%s\" al %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Eraro okazis dum ricevi “%s� de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Eraro okazis dum ricevi dosieron"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Eraro okazis dum sendi “%s� al %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Eraro okazis dum sendi dosieron"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "“%s� ricevi�is de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "“%s� sendi�is al %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Dosiertransigo fini�is"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Atendante respondon de la alia partoprenanto"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrolante la integrecon de “%s�"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Haketante “%s�"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restante"
 
@@ -3997,7 +3850,11 @@ msgstr "Dosiertransigoj"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Forigi kompletajn, nuligitajn kaj fu�ajn dosiertransigojn el la listo"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "E_nporti"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4005,171 +3862,196 @@ msgstr ""
 "Neniuj importeblaj kontoj trovi�is. Empatio aktuale subtenas importi kontojn "
 "de nur Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Enporti kontojn"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Enporti"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Fonto"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Provizi pasvorton"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Malkonekti"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Vi agordu konton por vidi kontaktojn ĉi tie."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Neniu kongruaĵo trovi�is"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Pardonu, %s kontoj ne povas uzataj �is via programaro %s estas �isdatigita."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Äœisdatigi programaron..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Fermi"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Rekonekti"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redakti konton"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Fermi"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr "Plenumi la konton %s (%s)…"
+msgstr "Plenumi la konton %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Plenumi krediton en konto"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
-msgstr "Plenumi konton…"
+msgstr "Plenumi konton..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Vi en�altu unu de viaj kontoj por vidi kontaktojn ĉi tie."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Vi en�altu na %s por vidi kontaktojn ĉi tie."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontaktoj sur _mapo"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Konto-agordoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Bilanco de konto"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova konversacio…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Serĉi en kontakt_listo"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _voko…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Ali�i al librosignitajn ĉambrojn"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Serĉi kontaktojn…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Administri librosignitajn ĉambrojn"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Dosiertransigoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormala grandeco"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Nekonektaj kontaktoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _voko…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Montri p_rotokolojn"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normala grandeco kun _avataroj"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Bilanco de konto"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontaktoj sur _mapo"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Kontoj"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blokitaj kontaktoj"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "Ago_rdoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Montri p_rotokolojn"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Serĉi en kontakt_listo"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordigi laÅ­ _nomo"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordigi laÅ­ _stato"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Kontoj"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normala grando kun _uzantobildoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokitaj kontoj"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormala grando"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
-msgstr "_Kompakta grandeco"
+msgstr "_Kompakta grando"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Dosiertransigoj"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Ĉamb_ro"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Ali�i…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova konversacio…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Nekonektaj kontaktoj"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personaj informoj"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Ĉamb_ro"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Ali�i al librosignitajn ĉambrojn"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Serĉi kontaktojn…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Babilĉambro"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membroj"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4182,22 +4064,27 @@ msgstr ""
 "Pasvorto bezonata: %s\n"
 "Membroj: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Jes"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne eblas komenci listi la ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne eblis ĉesi listi la ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne eblis �argi ĉambroliston"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Ali�i al ĉambro"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4207,6 +4094,10 @@ msgstr ""
 "ĉambroj en la liston."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Ĉamb_ro:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4214,374 +4105,397 @@ msgstr ""
 "Enmetu la servilon kiu gastigas la ĉambron, aŭ lasu �in malplena se la "
 "ĉambro estas ĉe la servilo de la aktuala konto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Ali�i al ĉambro"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne eblis �argi ĉambroliston"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Ĉambrolisto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Ĉamb_ro:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Ricevis mesa�on"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Sendis mesa�on"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nova konversacio"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontakto malkonektas"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Kontakto konektas"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakto konektas"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konto konektis"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konto malkonektis"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Lingvo"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # Traduko de Remeo kaj Julieta venas de:
 # http://donh.best.vwh.net/Esperanto/Literaturo/Revuoj/np/np5602/romeo_julieta.html
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo! Kial estas vi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "La patron neu kaj la nomon ĵetu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Aŭ, se ne tio, ĵuru vin nur mia,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "kaj mi ne estos Kapuleto plu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Ĉu plu aŭskulti, aŭ jam nun paroli?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr "Juliet malkonektis"
+msgstr "Juliet nekonekti�is"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Agordoj"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Montri _miensimbolojn kiel bildoj"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Montri la kontakt_liston en ĉambroj"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Konduto"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Komenci babilejojn en:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Babileja _etoso:"
+msgid "new ta_bs"
+msgstr "novaj _langetoj"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "El�alti sciigojn kiam oni foras aŭ okupi�as"
+msgid "new _windows"
+msgstr "novaj _fenestroj"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "El�alti sonojn kiam oni for_as aŭ okupi�as"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Montri venantajn mesa�ojn en la sciiga areo"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Aŭtomate konekti je la lanĉo"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Eĥo-nuligado plibonigas la klarecon de via voĉo al la alia babilanto, sed �i "
-"povas kaŭzi problemojn ĉe kelkaj komputiloj. Se vi aŭ la alia babilanto "
-"aŭdas strangajn bruojn aŭ eraretojn dum vokoj, provu el�alti la eĥo-"
-"nuligadon kaj rekomencu la vokon. "
+msgid "Log conversations"
+msgstr "Protokoli konversaciojn"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "En�alti sciigojn kiam kontakto konektas"
+msgid "Behavior"
+msgstr "Konduto"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "En�alti sciigojn kian kontakto malkonektas"
+msgid "General"
+msgstr "Äœenerale"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "En�alti sciigojn kiam la _babilo ne estas fokusita"
+msgid "_Enable bubble notifications"
+msgstr "Ŝ_alti vezikajn atentigojn"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "En�alti literumkontrolon por la lingvoj:"
+msgid "Disable notifications when _away or busy"
+msgstr "El�alti sciigojn kiam oni foras aŭ okupi�as"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Äœenerale"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "En�alti sciigojn kiam la _babilo ne estas fokusita"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Nivelo de enigo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "En�alti sciigojn kiam kontakto konektas"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "LaÅ­teco de enigo:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "En�alti sciigojn kian kontakto malkonektas"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Atentigoj"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Lokfontoj:"
+msgid "_Enable sound notifications"
+msgstr "Aktivigi sonajn at_entigojn"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Protokoli konversaciojn"
+msgid "Disable sounds when _away or busy"
+msgstr "El�alti sonojn kiam oni for_as aŭ okupi�as"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Atentigoj"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Ludi sonojn por eventoj"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sonoj"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privateco"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Uzi eĥo-nuligadon por plibonigi vokkvaliton"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Kiam la precizo de la loko redukti�as, nenio pli preciza ol la urbo, �tato "
-"kaj lando publiki�os. Koordinatoj de GPS precizos je nur 1 decimalo."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Montri _miensimbolojn kiel bildoj"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Montri la kontakt_liston en ĉambroj"
+"Eĥo-nuligado plibonigas la klarecon de via voĉo al la alia babilanto, sed �i "
+"povas kaŭzi problemojn ĉe kelkaj komputiloj. Se vi aŭ la alia babilanto "
+"aŭdas strangajn bruojn aŭ eraretojn dum vokoj, provu el�alti la eĥo-"
+"nuligadon kaj rekomencu la vokon."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sonoj"
+msgid "_Publish location to my contacts"
+msgstr "_Publikigi mian lokon al miaj kontaktoj"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Literumkontrolo"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"La listo de lingvoj enhavas nur la lingvojn por kiuj vortaro instali�is."
+"Kiam la precizo de la loko redukti�as, nenio pli preciza ol la urbo, �tato "
+"kaj lando publiki�os. Koordinatoj de GPS precizos je nur 1 decimalo."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Etosoj"
+msgid "_Reduce location accuracy"
+msgstr "_Redukti la precizon de la loko"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variaĵo:"
+msgid "Privacy"
+msgstr "Privateco"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Aŭtomate konekti je la lanĉo"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Po�telefono"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "Ŝ_alti vezikajn atentigojn"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Reto (IP, Sendrata)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Aktivigi sonajn at_entigojn"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Lokfontoj:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Reto (IP, Sendrata)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La listo de lingvoj enhavas nur la lingvojn por kiuj vortaro instali�is."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
+msgid "Enable spell checking for languages:"
+msgstr "En�alti literumkontrolon por la lingvoj:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Publikigi mian lokon al miaj kontaktoj"
+msgid "Spell Checking"
+msgstr "Literumkontrolo"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Babileja _etoso:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "_Redukti la precizon de la loko"
+msgid "Variant:"
+msgstr "Variaĵo:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Etosoj"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Ĉ_esi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Voki la kontakton denove"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Filmilo el�altita"
+msgid "Redial"
+msgstr "Revoki"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Filmilo en�altita"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video el�altita"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "El�alti la filmilon kaj ĉesi elsendi videon"
+msgid "Video Preview"
+msgstr "Videa antaÅ­vido"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "En�alti la filmilon kaj elsendi videon"
+msgid "Video On"
+msgstr "Video en�altita"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "En�alti la filmilon sed ne elsendi videon"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Voki la kontakton denove"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "AntaÅ­rigardo"
+msgid "Camera Off"
+msgstr "Filmilo el�altita"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Revoki"
+msgid "Disable camera and stop sending video"
+msgstr "El�alti la filmilon kaj ĉesi elsendi videon"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "AntaÅ­rigardo"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video el�altita"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "En�alti la filmilon sed ne elsendi videon"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video en�altita"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Filmilo en�altita"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videa antaÅ­vido"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "En�alti la filmilon kaj elsendi videon"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vido de la mapo de kontakoj"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Konservi"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Ligilo al Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Repondo de Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datumoj estas tro granda por unuopa enmeto. Bonvole konservi protokolon al "
+"dosiero."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Sencimig-fenestro"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Sendi al Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "PaÅ­zo"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivelo "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Sencimigo"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informo"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mesa�o"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Averto"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritike"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Retregiono"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorio"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivelo"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4589,179 +4503,285 @@ msgstr ""
 "La elektita kontaktadministrilo ne subtenas la kromprogramon de fora "
 "sencimigo."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Inviti partoprenonton"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Elektu kontakton por inviti al la konversacio:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Inviti"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Montri neniun dialogojn; fari laboron (ekz. importado) kaj eliri"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ne montri iun ajn dialogojn krom se estas nur kontoj de “proksima homoj�"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Unue elekti la indikitan konton (ekz. gabble/jabber/foo_40ekzemplo_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empatio-kontoj"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empatio-kontoj"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Montri specifan servon"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empatio-sencimigilo"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empatio-sencimigilo"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
-msgstr "- Babililo 'Empatio'"
+msgstr "- Babilkliento Empatio"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rifuzi"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Respondi per video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Malakcepti"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Akcepti"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Provizi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ĵus provis voki vin, sed vi jam estis en alia voko."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Atendanta"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silentigi"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "DaÅ­ro"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Via aktuala bilanco estas %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Pardonu, via kredito ne sufiĉas por tiu voko."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Plenumi konton"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uskleca kongruo"
 
-#~ msgid "All"
-#~ msgstr "Ĉiuj"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Kian babilkonton vi havas?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Aldono de nova konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Proksimaj homoj"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empatio povas aÅ­tomate eltrovi la homojn kiu konektis al la sama reto kiel "
+"vi kaj babili kun ili. Se vi volas uzi ĉi tiun trajton, bonvolu kontroli ĉu "
+"la jenaj detaloj �ustas."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Vi povas facile �an�i tiujn detalojn poste aŭ el�alti tiun trajton per "
+"elekti <span style=\"italic\">Redakti → Kontoj</span> en la kontaktaro."
+
+#~ msgid "_Accept"
+#~ msgstr "_Akcepti"
 
-#~ msgid "Date"
-#~ msgstr "Dato"
+#~ msgid "Personal Information"
+#~ msgstr "Personaj informoj"
 
-#~ msgid "Conversations"
-#~ msgstr "Konversacioj"
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "R_edakti"
 
-#~ msgid "Find Next"
-#~ msgstr "Trovi la sekvan"
+#~ msgid "Birthday:"
+#~ msgstr "Naski�tago:"
 
-#~ msgid "Find Previous"
-#~ msgstr "Trovi la antaÅ­an"
+#~ msgid "Full name:"
+#~ msgstr "Tuta nomo:"
 
-#~ msgid "_For:"
-#~ msgstr "_Por:"
+#~ msgid "C_hat"
+#~ msgstr "_Babilo"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Redakti kutimajn mesa�oj"
+#~ msgid "_Personal Information"
+#~ msgstr "_Personaj informoj"
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Konservitaj stat-mesa�oj"
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redakti->Kontoj"
 
-#~ msgid "Show and edit accounts"
-#~ msgstr "Montri kaj redakti kontojn"
+#~ msgid "E-mail address:"
+#~ msgstr "Retpo�tadreso:"
 
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empatio demandis pri importi kontojn"
+#~ msgid "Phone number:"
+#~ msgstr "Telefonnumero:"
 
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Ĉu Empatio demandu pri enporto de kontoj de aliaj progamoj?"
+#~ msgid "Continue"
+#~ msgstr "DaÅ­rigi"
 
-#~ msgid "Your software is too old"
-#~ msgstr "Via programaro estas tro maljuna"
+#~ msgid "The error message was: %s"
+#~ msgstr "La erarmesa�o estis: %s"
 
-#~ msgid "_Accept"
-#~ msgstr "_Akcepti"
+#~ msgid "An error occurred"
+#~ msgstr "Eraro aperis"
+
+#~ msgid "There was an error."
+#~ msgstr "Okazis eraro."
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, tio sufiĉas nun"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, mi volas novan konton"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokolo:"
+
+#~ msgid "No protocol installed"
+#~ msgstr "Neniu protokolo estas instalita"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empatio translokis papiliajn spurojn"
+
+#~ msgid "Website:"
+#~ msgstr "Retpa�aro:"
+
+#~ msgid "Select a contact"
+#~ msgstr "Elekti kontakton"
+
+#~ msgid "_Link"
+#~ msgstr "_Ligi"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Malligi"
+
+#~ msgid "C_all"
+#~ msgstr "_Voki"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Bonvenon al Empatio"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Nuligi"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupite"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Ingotipo estas nesubtenata"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Malligi…"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-ID:"
+
+#~ msgid "Send _Video"
+#~ msgstr "Sendi _videon"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "Update software..."
-#~ msgstr "Äœisdatigi programaron..."
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "Context"
-#~ msgstr "Kunteksto"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "%s is now offline."
-#~ msgstr "%s estas nun nekonektite."
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "%s is now online."
-#~ msgstr "%s estas nun konektite."
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
diff --git a/po/es.po b/po/es.po
index 86072fa66..39710cb02 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2003 Free Software Foundation
 # This file is distributed under the same license as the Gossip package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2011-12-23 14:51+0100\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 14:15+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,489 +20,501 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de mensajería instantánea"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensajería instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de mensajería instantánea"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Cuentas de mensajería y Voz IP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestionar las cuentas de mensajería y Voz IP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
+msgid "Connection managers should be used"
+msgstr "Se deberían usar gestores de conexión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Dispositivo de cámara"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Indica si se debe usan usar gestores de conectividad para desconectarse/"
+"reconectarse automáticamente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Posición de la cámara"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy se debería autoconectar al inicio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Carácter que añadir después del apodo cuando se usa el completado de apodos "
-"(tab) en salas de chat."
+"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
+"inicio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema de la ventana de charla"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy debería mostrar ausencia en inactividad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Variante del tema de la ventana de charla"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
-"(ej. «es, en, fr»)."
+"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
+"usuario está inactivo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Carpeta de descargas predeterminada de Epiphany"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Lista compacta de contactos"
+msgid "The default folder to save file transfers in."
+msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Se deberían usar gestores de conexión"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Número mágico usado para comprobar si se deben ejecutar tareas de limpieza"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Criterio de ordenación de la lista de contactos"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c usa este número para comprobar si se deben "
+"ejecutar o no las tareas de limpieza. Los usuarios no deben cambiar esta "
+"clave manualmente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
-"sala."
+msgid "Show offline contacts"
+msgstr "Mostrar contactos no conectados"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
-"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
-"ej. /dev/video0."
+"Indica si se debe mostrar los contactos que están desconectados en la lista "
+"de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Carpeta predeterminada para seleccionar un avatar"
+msgid "Show avatars"
+msgstr "Mostrar avatares"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Desactivar las notificaciones emergentes al estar ausente"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Indica si se deben mostrar los avatares para los contactos en la lista de "
+"contactos y ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Desactivar los sonidos al ausentarse"
+msgid "Show protocols"
+msgstr "Mostrar protocolos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Mostrar los eventos entrantes en el área de estado"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Indica si se deben mostrar los protocolos para los contactos en la lista de "
+"contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
-"directamente al usuario."
+msgid "Show Balance in contact list"
+msgstr "Mostrar crédito en la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Soporte de cancelación de eco"
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy puede publicar la ubicación del usuario"
+msgid "Compact contact list"
+msgstr "Lista compacta de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy puede usar el GPS para deducir la ubicación"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
+msgid "Hide main window"
+msgstr "Ocultar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy puede usar la red para deducir la ubicación"
+msgid "Hide the main window."
+msgstr "Ocultar la ventana principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Carpeta de descargas predeterminada de Epiphany"
+msgid "Default directory to select an avatar image from"
+msgstr "Carpeta predeterminada para seleccionar un avatar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy debería mostrar ausencia en inactividad"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Última carpeta de la que se eligió un avatar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy se debería autoconectar al inicio"
+msgid "Open new chats in separate windows"
+msgstr "Abrir chats nuevos en ventanas separadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy debería reducir la precisión de la ubicación"
+msgid "Always open a separate chat window for new chats."
+msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
+msgid "Display incoming events in the status area"
+msgstr "Mostrar los eventos entrantes en el área de estado"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Activar las herramientas de desarrollo de WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
+"directamente al usuario."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Activar notificaciones emergentes para mensajes nuevos"
+msgid "The position for the chat window side pane"
+msgstr "La posición para el panel lateral de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Activar revisor ortográfico"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"La posición almacenada (en píxeles) del panel lateral de la ventana de "
+"charla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Ocultar la ventana principal"
+msgid "Show contact groups"
+msgstr "Mostrar grupos de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Ocultar la ventana principal."
+msgid "Whether to show groups in the contact list."
+msgstr "Indica si se deben mostrar los grupos en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
+msgid "Contact list sort criterion"
+msgstr "Criterio de ordenación de la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Carácter de completado de apodo"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Qué criterio usar al ordenar la lista de contactos. El predeterminado es "
+"ordenar por el estado del contacto con el valor «state» (estado). Un valor "
+"«nombre» (nombre) ordenará la lista por el nombre."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Abrir chats nuevos en ventanas separadas"
+msgid "Use notification sounds"
+msgstr "Usar sonidos de notificación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Ruta del tema Adium que usar"
+msgid "Whether to play a sound to notify of events."
+msgstr "Indica si se debe reproducir un sonido para notificar eventos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
+msgid "Disable sounds when away"
+msgstr "Desactivar los sonidos al ausentarse"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Reproducir un sonido cuando lleguen mensajes"
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Reproducir un sonido para conversaciones nuevas"
+msgid "Play a sound for incoming messages"
+msgstr "Reproducir un sonido cuando lleguen mensajes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un sonido al enviar mensajes"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un sonido cuando un contacto inicie sesión"
+msgid "Play a sound for outgoing messages"
+msgstr "Reproducir un sonido al enviar mensajes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes salientes."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Reproducir un sonido cuando inicio sesión"
+msgid "Play a sound for new conversations"
+msgstr "Reproducir un sonido para conversaciones nuevas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Reproducir un sonido al finalizar una sesión"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproducir un sonido cuando un contacto inicie sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
+"de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
+"sesión de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Mostrar crédito en la lista de contactos"
+msgid "Play a sound when we log in"
+msgstr "Reproducir un sonido cuando inicio sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Mostrar avatares"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Mostrar lista de contactos en salas"
+msgid "Play a sound when we log out"
+msgstr "Reproducir un sonido al finalizar una sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Mostrar contactos no conectados"
+msgid "Enable popup notifications for new messages"
+msgstr "Activar notificaciones emergentes para mensajes nuevos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Mostrar protocolos"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Idiomas para revisión ortográfica"
+msgid "Disable popup notifications when away"
+msgstr "Desactivar las notificaciones emergentes al estar ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Última carpeta de la que se eligió un avatar."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "La posición para el panel lateral de la ventana de charla"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"La posición almacenada (en píxeles) del panel lateral de la ventana de "
-"charla."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"El tema que se usará para mostrar la conversación en las ventanas de chat."
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se conecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"La variante del tema que se usará para mostrar la conversación en las "
-"ventanas de chat."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Usar emoticonos gráficos"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se desconecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Usar sonidos de notificación"
+msgid "Use graphical smileys"
+msgstr "Usar emoticonos gráficos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Usar tema para salas de chat"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
+"conversaciones."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
+msgid "Show contact list in rooms"
+msgstr "Mostrar lista de contactos en salas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indica si Empathy puede usar la red telefónica móvil para deducir la "
-"ubicación."
+msgid "Chat window theme"
+msgstr "Tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+"El tema que se usará para mostrar la conversación en las ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
-"inicio."
+msgid "Chat window theme variant"
+msgstr "Variante del tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
-"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
-"usuario está inactivo."
+"La variante del tema que se usará para mostrar la conversación en las "
+"ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
-"de privacidad."
+msgid "Path of the Adium theme to use"
+msgstr "Ruta del tema Adium que usar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Indica si Empathy debería usar el avatar del contacto como el icono de la "
-"ventana de chat."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar las herramientas de desarrollo de WebKit"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
 "web, den activarse."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Indica si se debe usan usar gestores de conectividad para desconectarse/"
-"reconectarse automáticamente."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
-"con los que quiere comprobarlo."
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a otros usuarios de cuándo les esta escribiendo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
-"conversaciones."
+"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al "
+"estado «ausente»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
-"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Usar tema para salas de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
-"de los contactos en la red."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Indica si se debe usar el tema para salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
-"sesión de los contactos en la red."
+msgid "Spell checking languages"
+msgstr "Idiomas para revisión ortográfica"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Indica si se debe reproducir un sonido para notificar eventos."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
+"(ej. «es, en, fr»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
+msgid "Enable spell checker"
+msgstr "Activar revisor ortográfico"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
-"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
+"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
+"con los que quiere comprobarlo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes salientes."
+msgid "Nick completed character"
+msgstr "Carácter de completado de apodo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carácter que añadir después del apodo cuando se usa el completado de apodos "
+"(tab) en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
-"ausente u ocupado."
+"Indica si Empathy debería usar el avatar del contacto como el icono de la "
+"ventana de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se desconecta."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se conecta."
+"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
+"sala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
+msgid "Camera device"
+msgstr "Dispositivo de cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo."
+"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
+"ej. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
+msgid "Camera position"
+msgstr "Posición de la cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Indica si se deben mostrar los avatares para los contactos en la lista de "
-"contactos y ventanas de chat."
+msgid "Position the camera preview should be during a call."
+msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Indica si se debe mostrar los contactos que están desconectados en la lista "
-"de contactos."
+msgid "Echo cancellation support"
+msgstr "Soporte de cancelación de eco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
-"ausente u ocupado."
+"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Indica si se deben mostrar los protocolos para los contactos en la lista de "
-"contactos."
+msgid "Show hint about closing the main window"
+msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -510,75 +522,97 @@ msgstr ""
 "Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
 "principal con el botón «x» en la barra de título."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy puede publicar la ubicación del usuario"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Indica si se debe usar el tema para salas de chat."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy puede usar la red para deducir la ubicación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Qué criterio usar al ordenar la lista de contactos. El criterio "
-"predeterminado es ordenar por el nombre del contacto con el valor "
-"«name» (nombre). Un valor «state» (estado) ordenará la lista por el estado."
+"Indica si Empathy puede usar la red telefónica móvil para deducir la "
+"ubicación."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gestionar las cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy puede usar el GPS para deducir la ubicación"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy debería reducir la precisión de la ubicación"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
+"de privacidad."
+
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Se requirió un cambio en el estado"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "El otro participante canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Error la intentar transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "El otro participante no puede transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Se completó la transferencia de archivo pero el archivo está corrupto"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "El contacto remoto no soporta la transferencia de archivos"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "El archivo seleccionado no es un archivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Llamada perdida de %s"
@@ -594,141 +628,141 @@ msgstr "Llamó %s"
 msgid "Call from %s"
 msgstr "Llamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "El estado se ha establecido a desconectado"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "El recurso ya está conectado al servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta cuenta ya está conectada al servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está demasiado ocupado para gestionar la conexión"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -737,78 +771,97 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Su software es demasiado antiguo"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Error interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo Japón"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace %d segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace %d minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace %d hora"
 msgstr[1] "hace %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace %d día"
 msgstr[1] "hace %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace %d semana"
 msgstr[1] "hace %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace %d mes"
 msgstr[1] "hace %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "No se encontró la contraseña"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Contraseña de la cuenta IM para %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Contraseña para la sala de chat «%s» en la cuenta %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Cuenta"
 
@@ -826,30 +879,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta cuenta ya existe en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva en el servidor"
 
@@ -858,137 +911,137 @@ msgstr "Crear una cuenta nueva en el servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Cuenta nueva"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Contra_seña:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avanzadas"
+msgid "Screen _Name:"
+msgstr "_Nombre en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Contra_seña:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Recordar contraseña"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Puerto:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Recordar contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nombre en pantalla:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "¿Cuál es su contraseña de AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "¿Cuál es su nombre en pantalla para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Puerto:"
+msgid "What is your AIM password?"
+msgstr "¿Cuál es su contraseña de AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Ejemplo:</b> usuario"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_ID de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Ejemplo:</b> usuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "¿Cuál es su ID de usuario para GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "¿Cuál es su contraseña de GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Ejemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "C_onjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "¿Cuál es su UIN de ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "¿Cuál es su contraseña de ICQ?"
 
@@ -1025,11 +1078,23 @@ msgstr "Opciones"
 msgid "None"
 msgstr "Ninguno"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Red"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Red:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Conjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1037,14 +1102,6 @@ msgstr ""
 "La mayoría de los servidores IRC no necesitan una contraseña, de tal forma "
 "que si no está seguro, no introduzca una contraseña."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Red"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Red:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Apodo:"
@@ -1061,48 +1118,20 @@ msgstr "Mensaje de salida:"
 msgid "Real name:"
 msgstr "Nombre real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "¿Cuál es su apodo del IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "¿Qué red de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Ejemplo:</b> usuario@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Ejemplo:</b> usuario@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requiere ci_frado (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorar los errores de certificados SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Sobreescribir los ajustes del servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridad:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "¿Cuál es su apodo del IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Re_curso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "¿Cuál es su usuario de Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1114,179 +1143,203 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">esta página</a> para "
 "elegir un nombre de usuario en Facebook si no tiene uno."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar SS_L antiguo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "¿Cuál es su contraseña de Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "¿Cuál es su usuario de Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "¿Cuál es su ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Ejemplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "¿Cuál es su contraseña de Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Ejemplo:</b> usuario@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignorar los errores de certificados SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridad:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Re_curso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Requiere ci_frado (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar SS_L antiguo"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Sobreescribir los ajustes del servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "¿Cuál es su ID de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "¿Cuál es su contraseña de Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "¿Cuál es su contraseña de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "¿Cuál es la contraseña que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Ejemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "¿Cuál es su ID de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "¿Cuál es su contraseña de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Dirección de correo-_e:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Apo_do:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "Ape_llidos:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nombre:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nombre p_ublicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "Ape_llidos:"
+msgid "E-_mail address:"
+msgstr "Dirección de correo-_e:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nombre p_ublicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Ejemplo:</b> usuario@mi.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Usuario para la autenticación:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descubrir vinculación"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir el servidor STUN automáticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar errores TLS"
+msgid "NAT Traversal Options"
+msgstr "Opciones de NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opciones del proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opciones de «keepalive»"
+msgid "Miscellaneous Options"
+msgstr "Opciones de miscelánea"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Enrutado impreciso"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir el servidor STUN automáticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opciones de miscelánea"
+msgid "Discover Binding"
+msgstr "Descubrir vinculación"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opciones de NAT transversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opciones de «keepalive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Puerto:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opciones del proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Usuario para la autenticación:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Enrutado impreciso"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar errores TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
+msgid "Port:"
+msgstr "Puerto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "¿Cuál es la contraseña de su cuenta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "¿Cuál es su ID de inicio de sesión SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Usuario:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "¿Cuál es la contraseña de su cuenta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ignorar invitaciones a conferencias y salas de chat"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Configuración de la lista de _salas:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "¿Cuál es su ID de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "¿Cuál es su contraseña de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D de Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Configuración de la lista de _salas:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1324,65 +1377,65 @@ msgstr "Todos los archivos"
 msgid "Click to enlarge"
 msgstr "Pulse para agrandar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Hubo un error al iniciar la llamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "El contacto especificado no soporta llamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "El contacto especificado está desconectado"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "El contacto especificado no es válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo no soporta llamadas de emergencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "No tiene crédito suficiente para hacer esta llamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "El tema no está soportado en esta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "No le está permitido cambiar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s no es un identificador de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpiar todos los mensajes de la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: establecer el tema para la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1390,23 +1443,23 @@ msgstr ""
 "/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
 "actual de manera predeterminada"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1416,11 +1469,11 @@ msgstr ""
 "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
 "para unirse a una sala de chat nueva»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1428,122 +1481,128 @@ msgstr ""
 "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
 "definido, muestra su uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "no tiene balance suficiente para enviar el mensaje"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "no tiene balance suficiente para enviar el mensaje. <a href='%s'>Recargar</"
 "a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema establecido por %s a: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Añadir «%s» al diccionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Añadir «%s» al diccionario de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1551,12 +1610,12 @@ msgstr "%s se ha desconectado"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s expulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1564,17 +1623,17 @@ msgstr "%s fue expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1584,17 +1643,17 @@ msgstr "%s ha dejado la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -1602,55 +1661,55 @@ msgstr "Ahora %s se llama %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "¿Quiere guardar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorrecta; inténtelo de nuevo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversación"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1682,10 +1741,10 @@ msgstr "Editar contactos bloqueados"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1695,7 +1754,7 @@ msgstr "Contactos bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Quitar"
@@ -1718,34 +1777,30 @@ msgstr "_Abrir enlace"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información personal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "¿Está seguro de que quiere bloquear a «%s» para que no le vuelva a contactar?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1753,17 +1808,17 @@ msgstr[0] "Info_rmar de este contacto como abusivo"
 msgstr[1] "Info_rmar de estos contacto como abusivos"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir _luego"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuario"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir _luego"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1918,7 +1973,7 @@ msgstr "Altitud:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ubicación geográfica"
 
@@ -1935,15 +1990,25 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles personales"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles del contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nombre completo"
@@ -2009,54 +2074,49 @@ msgstr "postal"
 msgid "parcel"
 msgstr "grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ubicación</b> en (fecha)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identificador:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Apodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Información del cliente"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ubicación</b> en (fecha)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detalles del contacto"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Información solicitadas"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Identificador:"
+msgid "Client Information"
+msgstr "Información del cliente"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Información solicitadas"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2064,17 +2124,17 @@ msgstr ""
 "Seleccione los grupos en los que quiere que este contacto aparezca, Note que "
 "puede seleccionar más de un grupo o ningún grupo."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2094,158 +2154,140 @@ msgstr[1] "No se pueden bloquear la siguientes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar información del contacto"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos enlazados"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccionar contactos para enlazar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa del contacto nuevo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Se enlazarán entre sí los contactos seleccionados en la lista de la "
-"izquierda."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccionar la cuenta que usar para realizar la llamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Llamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Chat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts no está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instale gnome-contacts para acceder a los detalles de los contactos."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Enlazar contactos…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Invitándolo a esta sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Añadir contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Eliminar y _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Quitando grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2254,11 +2296,11 @@ msgstr ""
 "¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
 "quitará todos los contactos que componen este contacto enlazado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2269,23 +2311,23 @@ msgstr[1] "Contacto enlazado que contiene %u contactos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ubicación</b> en (fecha)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono o un dispositivo móvil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Red nueva"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Elegir una red IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Rei_niciar lista de redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleccionar"
@@ -2298,222 +2340,177 @@ msgstr "servidor nuevo"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Enlazar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desenlazar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Separar completamente los contactos enlazados mostrados en contactos "
-"separados."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Enlazar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "¿Desenlazar los contactos enlazados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"¿Está seguro de querer desenlazar estos contactos enlazados? Esto separará "
-"completamente los contactos enlazados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desenlazar"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatee en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y a las %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "La llamada duró %s, finalizó a las %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Cualquier hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quién"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Cuándo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Cualquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Chats de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Llamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Llamadas entrantes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Llamadas salientes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Llamadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Qué"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "¿Está seguro de que quiere eliminar todos los registros de conversaciones "
 "anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Eliminar de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Cargando…</span>"
+msgid "_File"
+msgstr "_Archivo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Borrar todo el histórico…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "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"
@@ -2559,7 +2556,7 @@ msgid "There was an error starting the conversation"
 msgstr "Hubo un error al iniciar la conversación"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Introduzca el identificador de un contacto o un número de teléfono:"
 
@@ -2569,17 +2566,17 @@ msgid "New Conversation"
 msgstr "Conversación nueva"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Llamada nueva"
 
@@ -2635,7 +2632,7 @@ msgstr "Mensajes personalizados…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Cuenta de %s nueva"
@@ -2645,20 +2642,20 @@ msgid "Find:"
 msgstr "Buscar:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Coincidir con capitalización"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "No se encontró la frase"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Siguiente"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "No se encontró la frase"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2704,12 +2701,12 @@ msgstr "Finalizó la llamada de voz"
 msgid "Edit Custom Messages"
 msgstr "Editar mensajes personalizados"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaje editado a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2788,34 +2785,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nombre del servidor de certificados: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "La conexión no es de confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexión no es de confianza. ¿Quiere continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Recordar esta opción para futuras conexiones"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles del certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "No hay espacio suficiente para guardar el archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2824,7 +2825,7 @@ msgstr ""
 "Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s "
 "disponible. Elija otra ubicación."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
@@ -3004,23 +3005,23 @@ msgstr "Sin mensaje de eeror"
 msgid "Instant Message (Empathy)"
 msgstr "Mensaje instantáneo (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensajería instantánea Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Error al contactar con el Gestor de cuentas"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3077,233 +3078,83 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Hubo un error al importar las cuentas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Hubo un error al analizar los detalles de la cuenta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Hubo un error al crear la cuenta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Hubo un error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "El mensaje de error fue: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Puede volver atrás e intentar introducir los detalles de su cuenta de nuevo "
-"o salir de este asistente y añadir cuentas posteriormente desde el menú "
-"Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Ocurrió un error"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "¿Qué tipo de cuenta tiene?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introducir los detalles de su cuenta"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "¿Qué tipo de cuenta quiere crear?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "¿Quiere crear otras cuentas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introducir los detalles para la cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
-"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
-"micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Sí, importar los detalles de mi cuenta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "No, quiero crear una cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione las cuentas que quiere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Sí"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "No, eso es todo por ahora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy puede descubrir automáticamente las personas conectadas en su misma "
-"red para poder chatear con ellas. Si quiere usar esta característica "
-"compruebe que los detalles de abajo son correctos. Puede cambiar fácilmente "
-"estos detalles posteriormente o desactivar esta característica usando el "
-"diálogo «Cuentas»."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Cuentas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_No quiero activar esta característica por ahora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"No podrá chatear con las personas conectadas en su red local, ya que "
-"telepathy-salut no está instalado. Si quiere activar esta característica "
-"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
-"diálogo Cuentas."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut no está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de cuentas de mensajería y Voz IP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Bienvenido a Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importar sus cuentas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Introduzca los detalles personales"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existen modificaciones sin guardar en su cuenta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Aún no se ha guardado su cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado: sin conexión de red"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta cuenta se ha desactivado porque se basa en un «backend» antiguo no "
+"soportado. Instale telepathy-haze y reinicie la sesión para migrar esta "
+"cuenta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Falló al recuperar su información personal del servidor."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar su información personal."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar los parámetros de la conexión…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "¿Quiere quitar %s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Esto no quitará su cuenta del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3312,15 +3163,23 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3332,19 +3191,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Añadir…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Cargando información de la cuenta"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No hay protocolos instalados"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando información de la cuenta"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3352,120 +3207,116 @@ msgstr ""
 "Para añadir una nueva cuenta debe instalar primero un «backend» para cada "
 "protocolo que quiera usar."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No hay «backends» de protocolos instalados"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr ": Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Gente cerca"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr ": Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Entrada de voz"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalles"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La dirección IP como la ve el servidor de Internet"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La dirección IP del par como la ve la otra parte"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconocido"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3474,8 +3325,8 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3484,8 +3335,8 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3494,29 +3345,29 @@ msgstr ""
 "No se puede establecer una conexión con %s. Uno de los dos puede estar en "
 "una red que no acepta conexiones directas."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de sonido necesarios para esta "
 "llamada"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de vídeo necesarios para esta "
 "llamada"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3527,262 +3378,309 @@ msgstr ""
 "\">Informe de este error</a> y añada los registros obtenidos de la ventana "
 "de «Depuración» en el menú de Ayuda."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Sonido"
+msgid "_Call"
+msgstr "_Llamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "_Microphone"
+msgstr "_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:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_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:289
+msgid "Close this window?"
+msgstr "¿Cerrar esta ventana?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que "
+"se una de nuevo."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Cerrar esta ventana hará que abandone una sala de chat. No recibirá más "
+"mensajes hasta que se una de nuevo."
+msgstr[1] ""
+"Cerrar esta ventana hará que abandone %u salas de chat. No recibirá más "
+"mensajes hasta que se una a ellas de nuevo."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "¿Cerrar %s?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Cerrar la ventana"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Abandonar la sala"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sin leer)"
 msgstr[1] "%s (%d sin leer)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (y otra)"
 msgstr[1] "%s (y otras %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sin leer de otros)"
 msgstr[1] "%s (%d sin leer de otros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sin leer de todos)"
 msgstr[1] "%s (%d sin leer de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Enviando %d mensaje"
 msgstr[1] "Enviando %d mensajes"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpiar"
+msgid "_Conversation"
+msgstr "_Conversación"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontacto"
+msgid "C_lear"
+msgstr "_Limpiar"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insertar _emoticono"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Sala de chat _favorita"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invitar pa_rticipante…"
+msgid "Notify for All Messages"
+msgstr "Notificar para todos los mensajes"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover pestaña a la _izquierda"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover pestaña a la _derecha"
+msgid "Invite _Participant…"
+msgstr "Invitar pa_rticipante…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar para todos los mensajes"
+msgid "C_ontact"
+msgstr "C_ontacto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversación"
+msgid "_Tabs"
+msgstr "_Pestañas"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Desacoplar pestaña"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Sala de chat _favorita"
+msgid "_Previous Tab"
+msgstr "Pestaña _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Pestaña _siguiente"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Pestaña _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Deshacer cerrar pestaña"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contactos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover pestaña a la _izquierda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Pestañas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover pestaña a la _derecha"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Deshacer cerrar pestaña"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Desacoplar pestaña"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3796,100 +3694,100 @@ msgstr "Sala"
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s le está llamando con vídeo. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s le está llamando. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Llamada de vídeo entrante de %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación para unirse a %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s le ha invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Le han invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s quiere permiso para ver cuándo está en línea"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4011,7 +3909,11 @@ msgstr ""
 "Eliminar transferencias de archivo completadas, canceladas y fallidas de la "
 "lista"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4019,170 +3921,185 @@ msgstr ""
 "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
 "soporta importar cuentas desde Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar una cuenta para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Las cuentas de %s no se pueden usar hasta que no se haya actualizado su "
 "software de %s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar el saldo de la cuenta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar una de sus cuentas para ver contactos aquí."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Debe activar %s para ver contactos 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-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "Prefere_ncias"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Mostrar p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Buscar en la lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nombre"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Cuentas"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamaño n_ormal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Tamaño _compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Transferencias de archivos"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Conversación _nueva…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Contactos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Información p_ersonal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Unirse a _favoritas"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Buscar contactos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Gestionar favoritos"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4194,7 +4111,7 @@ msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4207,22 +4124,27 @@ msgstr ""
 "Se necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sí"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "No se pudo cargar la lista de la sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Unirse a sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4232,6 +4154,10 @@ msgstr ""
 "la lista."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Sala:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4239,18 +4165,14 @@ msgstr ""
 "Introduzca el servidor que aloja la sala o déjelo vacío si la sala está en "
 "la cuenta del servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Unirse a sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "No se pudo cargar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Sala:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensaje recibido"
@@ -4264,7 +4186,7 @@ msgid "New conversation"
 msgstr "Conversación nueva"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "El contacto se conecta"
 
 #: ../src/empathy-preferences.c:170
@@ -4284,325 +4206,356 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Niega a tu padre y rehúsa tu nombre;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "O, si no quieres, júrame tan sólo que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Y dejaré yo de ser una Capuleto"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "¿Debo oír más o contestar a lo dicho?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta se ha desconectado"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Mostrar los _emoticonos como imágenes"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Mostrar _lista de contactos en salas"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamiento"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Iniciar chats en:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema del chat:"
+msgid "new ta_bs"
+msgstr "pestañas nue_vas"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
+msgid "new _windows"
+msgstr "v_entanas nuevas"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar los eventos entrantes en el área de notificación"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "C_onectarse automáticamente al inicio"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
-"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
-"persona oyen ruidos o tienen problemas durante las llamadas, intente "
-"desactivar la cancelación de eco y reiniciar la llamada."
+msgid "Log conversations"
+msgstr "Registrar conversaciones"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Activar notificaciones cuando un contacto se conecta"
+msgid "Behavior"
+msgstr "Comportamiento"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Activar notificaciones cuando un contacto se desconecta"
+msgid "General"
+msgstr "General"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+msgid "_Enable bubble notifications"
+msgstr "_Activar notificaciones de burbuja"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Activar la revisión ortográfica para idiomas:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar notificaciones cuando un contacto se conecta"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Orígenes de las ubicaciones:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar notificaciones cuando un contacto se desconecta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Registrar conversaciones"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notificaciones"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Activar notificaciones de sonido"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Reproducir sonido para eventos"
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Privacidad"
+msgid "Play sound for events"
+msgstr "Reproducir sonido para eventos"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Reducir la precisión de la ubicación significa que no se publicará nada más "
-"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
-"aleatorio añadido 1 lugar decimal."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Mostrar los _emoticonos como imágenes"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Mostrar _lista de contactos en salas"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Revisión ortográfica"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
-"diccionario instalado."
+"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
+"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
+"persona oyen ruidos o tienen problemas durante las llamadas, intente "
+"desactivar la cancelación de eco y reiniciar la llamada."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Temas"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publicar mi ubicación a mis contactos"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Reducir la precisión de la ubicación significa que no se publicará nada más "
+"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
+"aleatorio añadido 1 lugar decimal."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Variante:"
+msgid "_Reduce location accuracy"
+msgstr "_Reducir la precisión de la ubicación"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "C_onectarse automáticamente al inicio"
+msgid "Privacy"
+msgstr "Privacidad"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "Teléfono _móvil"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Activar notificaciones de burbuja"
+msgid "_Cellphone"
+msgstr "Teléfono _móvil"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Activar notificaciones de sonido"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Red (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Orígenes de las ubicaciones:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Abrir charlas nuevas en ventanas separadas"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
+"diccionario instalado."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicar mi ubicación a mis contactos"
+msgid "Enable spell checking for languages:"
+msgstr "Activar la revisión ortográfica para idiomas:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Revisión ortográfica"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Reducir la precisión de la ubicación"
+msgid "Chat Th_eme:"
+msgstr "_Tema del chat:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Llamar de nuevo al contacto"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara apagada"
+msgid "Redial"
+msgstr "Volver a llamar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara encendida"
+msgid "V_ideo"
+msgstr "Ví_deo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo apagado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar la cámara y dejar de enviar vídeo"
+msgid "Video Preview"
+msgstr "Vista preliminar del vídeo"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar la cámara y enviar vídeo"
+msgid "Video On"
+msgstr "Vídeo encendido"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar la cámara pero no enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Llamar de nuevo al contacto"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Vista previa"
+msgid "Camera Off"
+msgstr "Cámara apagada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Volver a llamar"
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar la cámara y dejar de enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Ví_deo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Vista previa"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo apagado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Activar la cámara pero no enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo encendido"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Cámara encendida"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Vista preliminar del vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Activar la cámara y enviar vídeo"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vista del mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Enlace a pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Respuesta de pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datos demasiado largos para un pegado sencillo. Guarde el registro en un "
+"archivo."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar a pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4610,48 +4563,44 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Elegir un contacto para invitar a la conversación:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar el asistente de cuentas"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr ": Cuentas en Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Cuentas en Empathy"
 
@@ -4667,85 +4616,85 @@ msgstr "- Depurador de Empathy"
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr ": Cliente de chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respuesta"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceptar"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s intentó llamarle, pero estaba en otra llamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Información"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duracio�n"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "su balance actual es %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "No tiene crédito suficiente para hacer esta llamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -4753,11 +4702,204 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con 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."
+msgstr ""
+"Empathy puede descubrir automáticamente las personas conectadas en su misma "
+"red para poder chatear con ellas. Si quiere usar esta característica "
+"compruebe que los detalles de abajo son correctos."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+" Puede cambiar fácilmente estos detalles posteriormente o desactivar esta "
+"característica eligiendo <span style=\"italic\">Editar → Cuentas</span> en "
+"la lista de contactos."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Hubo un error al importar las cuentas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Hubo un error al analizar los detalles de la cuenta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Hubo un error al crear la cuenta."
+
+#~ msgid "There was an error."
+#~ msgstr "Hubo un error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "El mensaje de error fue: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Puede volver atrás e intentar introducir los detalles de su cuenta de "
+#~ "nuevo o salir de este asistente y añadir cuentas posteriormente desde el "
+#~ "menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocurrió un error"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introducir los detalles de su cuenta"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "¿Qué tipo de cuenta quiere crear?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "¿Quiere crear otras cuentas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introducir los detalles para la cuenta nueva"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
+#~ "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
+#~ "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sí, importar los detalles de mi cuenta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sí, introduciré ahora los detalles de mi cuenta"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, quiero crear una cuenta nueva"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione las cuentas que quiere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, eso es todo por ahora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Cuentas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_No quiero activar esta característica por ahora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "No podrá chatear con las personas conectadas en su red local, ya que "
+#~ "telepathy-salut no está instalado. Si quiere activar esta característica "
+#~ "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde "
+#~ "el diálogo Cuentas."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut no está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de cuentas de mensajería y Voz IP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Bienvenido a Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importar sus cuentas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Introduzca los detalles personales"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar el asistente de cuentas"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccionar contactos para enlazar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa del contacto nuevo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Se enlazarán entre sí los contactos seleccionados en la lista de la "
+#~ "izquierda."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Enlazar contactos…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Enlazar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desenlazar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Separar completamente los contactos enlazados mostrados en contactos "
+#~ "separados."
+
+#~ msgid "_Link"
+#~ msgstr "_Enlazar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "¿Desenlazar los contactos enlazados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "¿Está seguro de querer desenlazar estos contactos enlazados? Esto "
+#~ "separará completamente los contactos enlazados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desenlazar"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos enlazados"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Abrir charlas nuevas en ventanas separadas"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información personal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información p_ersonal"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "El tipo de socket no está soportado"
 
@@ -5058,9 +5200,6 @@ msgstr "Añadiendo cuenta nueva"
 #~ "Se le ha ofrecido una invitación para el servicio %s pero no tiene la "
 #~ "aplicación necesaria para manejarla"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "Desconexión solicitada por el usuario"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>Ubicación</b>"
 
diff --git a/po/et.po b/po/et.po
index c27a1c552..5a1aec689 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,83 +11,128 @@ msgstr ""
 "Project-Id-Version: empathy MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-31 12:40+0000\n"
-"PO-Revision-Date: 2012-01-02 01:22+0200\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 13:52+0200\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: ESTONIA\n"
 
+msgid "Empathy"
+msgstr "Empathy"
+
+msgid "IM Client"
+msgstr "Välksõnumiklient"
+
+msgid "Empathy Internet Messaging"
+msgstr "Empathy interneti sõnumivahetus"
+
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 "Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste "
 "kaudu"
 
-msgid "Empathy"
-msgstr "Empathy"
+#. Tweak the dialog
+msgid "Messaging and VoIP Accounts"
+msgstr "Sõnumi- ja VoIP kontod"
 
-msgid "Empathy Internet Messaging"
-msgstr "Empathy interneti sõnumivahetus"
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Sõnumi- ja VoIP kontode haldamine"
 
-msgid "IM Client"
-msgstr "Välksõnumiklient"
+msgid "Connection managers should be used"
+msgstr "Kas peab ühenduste haldureid kasutama"
 
-msgid "Always open a separate chat window for new chats."
-msgstr "Uutele vestlustele avatakse alati eraldi aken."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
+"haldurit või mitte."
 
-msgid "Camera device"
-msgstr "Kaameraseade"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy peaks käivitumisel ise ühenduma"
 
-msgid "Camera position"
-msgstr "Kaamera asukoht"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
 
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
-"automaatlõpetust (tab-klahv)."
+"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
 
-msgid "Chat window theme"
-msgstr "Jututoaakende teema"
+msgid "Empathy default download folder"
+msgstr "Empathy vaikimisi allalaadimiste kataloog"
 
-msgid "Chat window theme variant"
-msgstr "Jututoaakende teema"
+msgid "The default folder to save file transfers in."
+msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
+
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Maagiline number, mis näitab, kas andmeid tuleks korrastada"
 
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
 msgstr ""
-"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+"empathy-sanity-cleaning.c kasutab seda numbrit, et veenduda, kas "
+"puhastusülesanded tuleks käivitada või mitte. Kasutajad ei peaks seda "
+"väärtust käsitsi muutma."
+
+msgid "Show offline contacts"
+msgstr "Ühendamata sõpru näidatakse"
+
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+
+msgid "Show avatars"
+msgstr "Näidatakse avatare"
+
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+
+msgid "Show protocols"
+msgstr "Kuva protokolle"
+
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+
+msgid "Show Balance in contact list"
+msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+
+msgid "Whether to show account balances in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontojääki."
 
 msgid "Compact contact list"
 msgstr "Kompaktne sõbranimekiri"
 
-msgid "Connection managers should be used"
-msgstr "Kas peab ühenduste haldureid kasutama"
-
-msgid "Contact list sort criterion"
-msgstr "Kontaktide nimekirja sortimise alus"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
 
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
+msgid "Hide main window"
+msgstr "Peida peaaken"
 
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
+msgid "Hide the main window."
+msgstr "Peaakna peitmine."
 
 msgid "Default directory to select an avatar image from"
 msgstr "Vaikimisi kataloog, millest valida avatari pilti"
 
-msgid "Disable popup notifications when away"
-msgstr "Eemalolekul on hüpikmärguanded keelatud"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Kataloog, kust viimati valiti avatari pilt."
 
-msgid "Disable sounds when away"
-msgstr "Heliteated on minu eemaloleku korral keelatud"
+msgid "Open new chats in separate windows"
+msgstr "Uued jututoad avatakse eraldi akendes"
+
+msgid "Always open a separate chat window for new chats."
+msgstr "Uutele vestlustele avatakse alati eraldi aken."
 
 msgid "Display incoming events in the status area"
 msgstr "Sündmuste kuvamine teatealal"
@@ -99,288 +144,270 @@ msgstr ""
 "Saabuvate sündmuste kuvamine teatealal. Kui väär, näidatakse neid kasutajale "
 "otse."
 
-msgid "Echo cancellation support"
-msgstr "Kaja vähendamise tugi"
-
-msgid "Empathy can publish the user's location"
-msgstr "Empathy tohib näidata kasutaja asukohta"
-
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
-
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
-
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
-
-msgid "Empathy default download folder"
-msgstr "Empathy vaikimisi allalaadimiste kataloog"
-
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
-
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy peaks käivitumisel ise ühenduma"
+msgid "The position for the chat window side pane"
+msgstr "Vestlusakna külgpaneeli asukoht"
 
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy peaks vähendama asukoha täpsust"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
 
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
+msgid "Show contact groups"
+msgstr "Kontaktide gruppide kuvamine"
 
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer tööriistade lubamine"
+msgid "Whether to show groups in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas gruppe."
 
-msgid "Enable popup notifications for new messages"
-msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+msgid "Contact list sort criterion"
+msgstr "Kontaktide nimekirja sortimise alus"
 
-msgid "Enable spell checker"
-msgstr "Õigekirjakontrolli lubamine"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Kontaktide nimekirja sortimise alus. Vaikimisi väärtus on \"state\", sel "
+"juhul sorditakse kontaktid oleku järgi. Väärtuse \"name\" korral toimub "
+"sortimine nime järgi."
 
-msgid "Hide main window"
-msgstr "Peida peaaken"
+msgid "Use notification sounds"
+msgstr "Teatehelisid esitatakse"
 
-msgid "Hide the main window."
-msgstr "Peaakna peitmine."
+msgid "Whether to play a sound to notify of events."
+msgstr "Kas esitada heli sündmustest märkuandmiseks."
 
-msgid "Last account selected in Join Room dialog"
-msgstr "Viimane konto, mis valiti \"Ãœhine jututoaga\" dialoogis"
+msgid "Disable sounds when away"
+msgstr "Heliteated on minu eemaloleku korral keelatud"
 
-msgid "Nick completed character"
-msgstr "Nimele lisamise märk"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
 
-msgid "Open new chats in separate windows"
-msgstr "Uued jututoad avatakse eraldi akendes"
+msgid "Play a sound for incoming messages"
+msgstr "Sissetulevate sõnumite puhul esitatakse heli"
 
-msgid "Path of the Adium theme to use"
-msgstr "Kasutatava Adiumi kujunduse asukoht"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
 
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
+msgid "Play a sound for outgoing messages"
+msgstr "Väljuvate sõnumite puhul esitatakse heli"
 
-msgid "Play a sound for incoming messages"
-msgstr "Sissetulevate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
 
 msgid "Play a sound for new conversations"
 msgstr "Uute vestluste puhul esitatakse heli"
 
-msgid "Play a sound for outgoing messages"
-msgstr "Väljuvate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
 
 msgid "Play a sound when a contact logs in"
 msgstr "Kontakti sisenemise puhul esitatakse heli"
 
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+
 msgid "Play a sound when a contact logs out"
 msgstr "Kontakti väljumise puhul esitatakse heli"
 
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+
 msgid "Play a sound when we log in"
 msgstr "Heli esitamine sisselogimisel"
 
+msgid "Whether to play a sound when logging into a network."
+msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+
 msgid "Play a sound when we log out"
 msgstr "Heli esitamine väljalogimisel"
 
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+
+msgid "Enable popup notifications for new messages"
+msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+
+msgid "Disable popup notifications when away"
+msgstr "Eemalolekul on hüpikmärguanded keelatud"
+
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Kui vestlus pole aktiivne, näidatakse hüpikteateid"
 
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
+"vestlus on juba avatud, kuid mitte fookuses."
+
 msgid "Pop up notifications when a contact logs in"
 msgstr "Kui kontakt siseneb, kuvatakse hüpikteade"
 
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+
 msgid "Pop up notifications when a contact logs out"
 msgstr "Kui kontakt väljub, kuvatakse hüpikteade"
 
-msgid "Position the camera preview should be during a call."
-msgstr "Enda kaamera pildi asukoht kõne ajal."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
 
-msgid "Show Balance in contact list"
-msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+msgid "Use graphical smileys"
+msgstr "Tujunägudele kasutatakse pilte"
 
-msgid "Show avatars"
-msgstr "Näidatakse avatare"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
 
 msgid "Show contact list in rooms"
 msgstr "Jututubades näidatakse liikmete loendit"
 
-msgid "Show hint about closing the main window"
-msgstr "Peaakna sulgemise kohta näidatakse soovitust"
-
-msgid "Show offline contacts"
-msgstr "Ühendamata sõpru näidatakse"
-
-msgid "Show protocols"
-msgstr "Kuva protokolle"
-
-msgid "Spell checking languages"
-msgstr "Õigekirjakontrolli keeled"
-
-msgid "The default folder to save file transfers in."
-msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
-
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Kataloog, kust viimati valiti avatari pilt."
-
-msgid "The position for the chat window side pane"
-msgstr "Vestlusakna külgpaneeli asukoht"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
 
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
+msgid "Chat window theme"
+msgstr "Jututoaakende teema"
 
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
+msgid "Chat window theme variant"
+msgstr "Jututoaakende teema"
+
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
-msgid "Use graphical smileys"
-msgstr "Tujunägudele kasutatakse pilte"
-
-msgid "Use notification sounds"
-msgstr "Teatehelisid esitatakse"
-
-msgid "Use theme for chat rooms"
-msgstr "Jututubadele kasutatakse teemat"
-
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
+msgid "Path of the Adium theme to use"
+msgstr "Kasutatava Adiumi kujunduse asukoht"
 
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
 
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer tööriistade lubamine"
 
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
 
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+msgid "Inform other users when you are typing to them"
+msgstr "Vestluskaaslastele antakse teada, kui sa parasjagu kirjutad neile"
 
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
+"Kas saata vestlusolekuid nagu 'composing' (kirjutab) või 'paused' (peatus). "
+"Praegu ei mõjuta 'gone' (eemal) olekut."
 
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
+msgid "Use theme for chat rooms"
+msgstr "Jututubadele kasutatakse teemat"
 
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Kas jututubadele kasutatakse kujundust või mitte."
 
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
+msgid "Spell checking languages"
+msgstr "Õigekirjakontrolli keeled"
 
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
-"haldurit või mitte."
+"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+
+msgid "Enable spell checker"
+msgstr "Õigekirjakontrolli lubamine"
 
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi."
 
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
+msgid "Nick completed character"
+msgstr "Nimele lisamise märk"
 
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
+"automaatlõpetust (tab-klahv)."
 
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
 
 msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
 
-msgid "Whether to play a sound to notify of events."
-msgstr "Kas esitada heli sündmustest märkuandmiseks."
+msgid "Last account selected in Join Room dialog"
+msgstr "Viimane konto, mis valiti \"Ãœhine jututoaga\" dialoogis"
 
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
 
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
+msgid "Camera device"
+msgstr "Kaameraseade"
 
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
 
-msgid "Whether to play a sound when logging into a network."
-msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+msgid "Camera position"
+msgstr "Kaamera asukoht"
 
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+msgid "Position the camera preview should be during a call."
+msgstr "Enda kaamera pildi asukoht kõne ajal."
 
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
+msgid "Echo cancellation support"
+msgstr "Kaja vähendamise tugi"
 
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
 
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+msgid "Show hint about closing the main window"
+msgstr "Peaakna sulgemise kohta näidatakse soovitust"
 
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
-"vestlus on juba avatud, kuid mitte fookuses."
-
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
 
-msgid "Whether to show account balances in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontojääki."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy tohib näidata kasutaja asukohta"
 
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
 
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
 
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
 
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
 
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
 
-msgid "Whether to show the contact list in compact mode."
-msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
 
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
 
-msgid "Whether to use the theme for chat rooms."
-msgstr "Kas jututubadele kasutatakse kujundust või mitte."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy peaks vähendama asukoha täpsust"
 
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Kontaktide nimekirja sortimise alus. Vaikimisi on väärtus \"name\" ja sel "
-"juhul sorditakse kontaktid nime järgi. Väärtuse \"state\" korral toimub "
-"sortimine oleku järgi."
-
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Sõnumi- ja VoIP kontode haldamine"
-
-#. Tweak the dialog
-msgid "Messaging and VoIP Accounts"
-msgstr "Sõnumi- ja VoIP kontod"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
 
 msgid "No reason was specified"
 msgstr "Põhjendust pole määratud."
@@ -505,8 +532,8 @@ msgstr "Ühendust pole võimalik luua"
 msgid "Connection has been lost"
 msgstr "Ãœhendus on katkenud"
 
-msgid "This resource is already connected to the server"
-msgstr "See ressurss on juba serverisse ühendunud"
+msgid "This account is already connected to the server"
+msgstr "Selle kontoga on juba serverisse ühendutud"
 
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
@@ -537,6 +564,9 @@ msgstr ""
 msgid "Your software is too old"
 msgstr "Sinu tarkvara on liiga vana"
 
+msgid "Internal error"
+msgstr "Sisemine viga"
+
 msgid "People Nearby"
 msgstr "Lähedalasuvad inimesed"
 
@@ -588,6 +618,17 @@ msgstr[1] "%d kuud tagasi"
 msgid "in the future"
 msgstr "tulevikus"
 
+msgid "Password not found"
+msgstr "Parooli ei leitud"
+
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s suhtluskonto parool (%s)"
+
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Jututoa '%s' parool kontol %s (%s)"
+
 msgid "All accounts"
 msgstr "Kõik kontod"
 
@@ -640,30 +681,18 @@ msgstr "%s konto"
 msgid "New account"
 msgstr "Uus konto"
 
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Näide:</b> MinuEkraaniNimi"
-
-msgid "Advanced"
-msgstr "Laiendatud"
-
 msgid "Pass_word:"
 msgstr "_Parool:"
 
-msgid "Remember Password"
-msgstr "Parooli peetakse meeles"
-
-#. remember password ticky box
-msgid "Remember password"
-msgstr "Parooli peetakse meeles"
-
 msgid "Screen _Name:"
 msgstr "Ekraani_nimi:"
 
-msgid "What is your AIM password?"
-msgstr "Mis on sinu AIM-i parool?"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Näide:</b> MinuEkraaniNimi"
 
-msgid "What is your AIM screen name?"
-msgstr "Mis on sinu AIM-i ekraaninimi?"
+#. remember password ticky box
+msgid "Remember password"
+msgstr "Parooli peetakse meeles"
 
 msgid "_Port:"
 msgstr "_Port:"
@@ -671,27 +700,39 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-msgid "<b>Example:</b> username"
-msgstr "<b>Näide:</b> kasutajanimi"
+msgid "Advanced"
+msgstr "Laiendatud"
+
+msgid "What is your AIM screen name?"
+msgstr "Mis on sinu AIM-i ekraaninimi?"
+
+msgid "What is your AIM password?"
+msgstr "Mis on sinu AIM-i parool?"
+
+msgid "Remember Password"
+msgstr "Parooli peetakse meeles"
 
 msgid "Login I_D:"
 msgstr "Sisselogimise I_D:"
 
+msgid "<b>Example:</b> username"
+msgstr "<b>Näide:</b> kasutajanimi"
+
 msgid "What is your GroupWise User ID?"
 msgstr "Mis on sinu GroupWise kasutaja ID?"
 
 msgid "What is your GroupWise password?"
 msgstr "Mis on sinu GroupWise parool?"
 
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Näide:</b> 123456789"
 
 msgid "Ch_aracter set:"
 msgstr "_Kooditabel:"
 
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
 msgid "What is your ICQ UIN?"
 msgstr "Mis on sinu ICQ UIN?"
 
@@ -723,9 +764,18 @@ msgstr "Valikud"
 msgid "None"
 msgstr "Puudub"
 
+msgid "Network"
+msgstr "Võrk"
+
+msgid "Network:"
+msgstr "Võrk:"
+
 msgid "Character set:"
 msgstr "Kooditabel:"
 
+msgid "Servers"
+msgstr "Serverid"
+
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -733,12 +783,6 @@ msgstr ""
 "Enamik IRC servereid ei vaja parooli. Kui sa pole kindel, ära sisesta "
 "parooli."
 
-msgid "Network"
-msgstr "Võrk"
-
-msgid "Network:"
-msgstr "Võrk:"
-
 msgid "Nickname:"
 msgstr "Hüüdnimi:"
 
@@ -751,35 +795,14 @@ msgstr "Lahkumise teade:"
 msgid "Real name:"
 msgstr "Pärisnimi:"
 
-msgid "Servers"
-msgstr "Serverid"
-
-msgid "What is your IRC nickname?"
-msgstr "Mis on sinu IRC ekraaninimi?"
-
 msgid "Which IRC network?"
 msgstr "Milline IRC võrk?"
 
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Näide:</b> kasutaja@gmail.com"
-
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Näide:</b> kasutaja@jabber.org"
-
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
-
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL-sertifikaadi vigu _eiratakse"
-
-msgid "Override server settings"
-msgstr "Serveri sätete eiramine"
-
-msgid "Priori_ty:"
-msgstr "_Tähtsus:"
+msgid "What is your IRC nickname?"
+msgstr "Mis on sinu IRC ekraaninimi?"
 
-msgid "Reso_urce:"
-msgstr "_Vahend:"
+msgid "What is your Facebook username?"
+msgstr "Mis on sinu Facebooki kasutajanimi?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 msgid ""
@@ -793,30 +816,48 @@ msgstr ""
 "Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
 "www.facebook.com/username/\">siin lehel</a>."
 
-msgid "Use old SS_L"
-msgstr "Kasutatakse _vana SSL-i"
-
 msgid "What is your Facebook password?"
 msgstr "Mis on sinu Facebooki parool?"
 
-msgid "What is your Facebook username?"
-msgstr "Mis on sinu Facebooki kasutajanimi?"
-
 msgid "What is your Google ID?"
 msgstr "Mis on sinu Google ID?"
 
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Näide:</b> kasutaja@gmail.com"
+
 msgid "What is your Google password?"
 msgstr "Mis on sinu Google parool?"
 
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Näide:</b> kasutaja@jabber.org"
+
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL-sertifikaadi vigu _eiratakse"
+
+msgid "Priori_ty:"
+msgstr "_Tähtsus:"
+
+msgid "Reso_urce:"
+msgstr "_Vahend:"
+
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
+
+msgid "Use old SS_L"
+msgstr "Kasutatakse _vana SSL-i"
+
+msgid "Override server settings"
+msgstr "Serveri sätete eiramine"
+
 msgid "What is your Jabber ID?"
 msgstr "Mis on sinu Jabberi ID?"
 
-msgid "What is your Jabber password?"
-msgstr "Mis on sinu Jabberi parool?"
-
 msgid "What is your desired Jabber ID?"
 msgstr "Mis on sinu poolt eelistatav Jabberi ID?"
 
+msgid "What is your Jabber password?"
+msgstr "Mis on sinu Jabberi parool?"
+
 msgid "What is your desired Jabber password?"
 msgstr "Mis on sinu poolt eelistatav Jabberi parool?"
 
@@ -829,99 +870,99 @@ msgstr "Mis on sinu Windows Live ID?"
 msgid "What is your Windows Live password?"
 msgstr "Mis on sinu Windows Live parool?"
 
-msgid "E-_mail address:"
-msgstr "_Meiliaadress:"
-
 msgid "Nic_kname:"
 msgstr "_Hüüdnimi:"
 
+msgid "_Last Name:"
+msgstr "_Perekonnanimi:"
+
 msgid "_First Name:"
 msgstr "_Eesnimi:"
 
+msgid "_Published Name:"
+msgstr "_Avaldatud nimi:"
+
 msgid "_Jabber ID:"
 msgstr "_Jabberi ID:"
 
-msgid "_Last Name:"
-msgstr "_Perekonnanimi:"
+msgid "E-_mail address:"
+msgstr "_Meiliaadress:"
 
-msgid "_Published Name:"
-msgstr "_Avaldatud nimi:"
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
 
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Näide:</b> kasutaja@minu.sip.server"
 
-msgid "Authentication username:"
-msgstr "Autentimise kasutajanimi:"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
 
-msgid "Discover Binding"
-msgstr "Seonduse avastamine"
+msgid "NAT Traversal Options"
+msgstr "NAT-traversal valikud"
+
+msgid "Proxy Options"
+msgstr "Proksi valikud"
+
+msgid "Miscellaneous Options"
+msgstr "Muud valikud"
+
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 msgid "Discover the STUN server automatically"
 msgstr "STUN-serveri automaatne tuvastus"
 
-msgid "Ignore TLS Errors"
-msgstr "TLS vigasid eiratakse"
+msgid "Discover Binding"
+msgstr "Seonduse avastamine"
 
-msgid "Interval (seconds)"
-msgstr "Intervall (sekundites)"
+msgid "Server:"
+msgstr "Server:"
 
 msgid "Keep-Alive Options"
 msgstr "Ãœhenduse elushoidmise valikud"
 
-msgid "Loose Routing"
-msgstr "Vaba marsruutimine"
-
 msgid "Mechanism:"
 msgstr "Mehhanism:"
 
-msgid "Miscellaneous Options"
-msgstr "Muud valikud"
-
-msgid "NAT Traversal Options"
-msgstr "NAT-traversal valikud"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Proxy Options"
-msgstr "Proksi valikud"
-
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekundites)"
 
-msgid "Server:"
-msgstr "Server:"
+msgid "Authentication username:"
+msgstr "Autentimise kasutajanimi:"
 
 msgid "Transport:"
 msgstr "Transport:"
 
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
+msgid "Loose Routing"
+msgstr "Vaba marsruutimine"
 
-msgid "What is your SIP account password?"
-msgstr "Mis on sinu SIP-konto parool?"
+msgid "Ignore TLS Errors"
+msgstr "TLS vigasid eiratakse"
+
+msgid "Port:"
+msgstr "Port:"
 
 msgid "What is your SIP login ID?"
 msgstr "Mis on sinu SIP-i sisselogimise ID?"
 
-msgid "_Username:"
-msgstr "_Kasutajanimi:"
+msgid "What is your SIP account password?"
+msgstr "Mis on sinu SIP-konto parool?"
+
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
 
 msgid "I_gnore conference and chat room invitations"
 msgstr "Konverentside ja jututubade kutseid _eiratakse"
 
+msgid "_Room List locale:"
+msgstr "_Tubade nimekirja lokaat:"
+
 msgid "What is your Yahoo! ID?"
 msgstr "Mis on sinu Yahoo! ID?"
 
 msgid "What is your Yahoo! password?"
 msgstr "Mis on sinu Yahoo! parool?"
 
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-msgid "_Room List locale:"
-msgstr "_Tubade nimekirja lokaat:"
-
 msgid "Couldn't convert image"
 msgstr "Pole võimalik pilti teisendada"
 
@@ -1086,6 +1127,11 @@ msgstr "Teema:"
 msgid "Topic set to: %s"
 msgstr "Teema on: %s"
 
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s määras uue teema: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
 msgid "No topic defined"
 msgstr "Teemat pole seatud"
 
@@ -1246,9 +1292,6 @@ msgstr "_Ava link"
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-msgid "Personal Information"
-msgstr "Isiklikud andmed"
-
 msgid "New Contact"
 msgstr "Uus kontakt"
 
@@ -1270,15 +1313,15 @@ msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Teata sellest kuritarvitavast kasutajast"
 msgstr[1] "_Teata nendest kuritarvitavatest kasutajatest"
 
-msgid "Decide _Later"
-msgstr "Otsusta _hiljem"
-
 msgid "Subscription Request"
 msgstr "Tellimuse päring"
 
 msgid "_Block User"
 msgstr "_Blokeeri kasutaja"
 
+msgid "Decide _Later"
+msgstr "Otsusta _hiljem"
+
 #. Title
 msgid "Search contacts"
 msgstr "Kontaktide otsimine"
@@ -1390,6 +1433,12 @@ msgstr "Avatari salvestamine"
 msgid "Unable to save avatar"
 msgstr "Avatari salvestamine pole võimalik"
 
+msgid "Personal Details"
+msgstr "Isiklikud andmed"
+
+msgid "Contact Details"
+msgstr "Kontaktandmed"
+
 msgid "Full name"
 msgstr "Täisnimi"
 
@@ -1440,36 +1489,33 @@ msgstr "postipakk"
 msgid "parcel"
 msgstr "kullerpakk"
 
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Asukoht</b> kuupäeval\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+msgid "Identifier:"
+msgstr "Kasutajanimi:"
 
 #. Alias
 msgid "Alias:"
 msgstr "Alias:"
 
-msgid "Client Information"
-msgstr "Kliendi andmed"
-
-msgid "Client:"
-msgstr "Klient:"
-
-msgid "Contact Details"
-msgstr "Kontaktandmed"
-
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-msgid "Identifier:"
-msgstr "Kasutajanimi:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Asukoht</b> kuupäeval\t"
 
 msgid "Information requested…"
 msgstr "Päriti andmeid…"
 
+msgid "Client Information"
+msgstr "Kliendi andmed"
+
 msgid "OS:"
 msgstr "OS:"
 
 msgid "Version:"
 msgstr "Versioon:"
 
+msgid "Client:"
+msgstr "Klient:"
+
 msgid "Groups"
 msgstr "Grupid"
 
@@ -1503,19 +1549,6 @@ msgstr[1] "Järgnevaid isikuid pole võimalik blokkida:"
 msgid "Edit Contact Information"
 msgstr "Kontakti andmete redigeerimine"
 
-#. Translators: the heading at the top of the Information dialogue
-msgid "Linked Contacts"
-msgstr "Liidetud kontaktid"
-
-msgid "Select contacts to link"
-msgstr "Vali kontaktid, keda kokku liita"
-
-msgid "New contact preview"
-msgstr "Uue kontakti eelvaade"
-
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Vasakul nimekirjas olevad kontaktid liidetakse kokku."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
@@ -1571,6 +1604,12 @@ msgstr "Jaga minu töölauda"
 msgid "Favorite"
 msgstr "Lemmik"
 
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts pole paigaldatud"
+
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Kontakti andmete kuvamiseks paigalda palun gnome-contacts."
+
 msgid "Infor_mation"
 msgstr "_Andmed"
 
@@ -1578,12 +1617,6 @@ msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ühenda kontaktid…"
-
 msgid "Inviting you to this room"
 msgstr "Kutse sellesse tuppa"
 
@@ -1653,42 +1686,6 @@ msgstr "uus server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-msgid "Link Contacts"
-msgstr "Kontaktide ühendamine"
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Eralda kontaktid…"
-
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Lingitud kontakti lahutamine seda moodustavateks kontaktideks."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-msgid "_Link"
-msgstr "_Ãœhenda"
-
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Kas lahutada lingitud kontakt '%s' osadeks?"
-
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Kas sa oled kindel, et tahad need lingitud kontakti eraldada? Sellega muutub "
-"lingitud kontakt jälle eraldi kontaktideks."
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Eralda"
-
 msgid "History"
 msgstr "Ajalugu"
 
@@ -1789,11 +1786,11 @@ msgstr "Puhasta kõik"
 msgid "Delete from:"
 msgstr "Kustuta kust:"
 
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Laadimine...</span>"
+msgid "_File"
+msgstr "_Fail"
 
-msgid "Chat"
-msgstr "Vestlus"
+msgid "_Edit"
+msgstr "_Redaktor"
 
 msgid "Delete All History..."
 msgstr "Kogu ajaloo kustutamine..."
@@ -1801,18 +1798,18 @@ msgstr "Kogu ajaloo kustutamine..."
 msgid "Profile"
 msgstr "Profiil"
 
+msgid "Chat"
+msgstr "Vestlus"
+
 msgid "Video"
 msgstr "Video"
 
-msgid "_Edit"
-msgstr "_Redaktor"
-
-msgid "_File"
-msgstr "_Fail"
-
 msgid "page 2"
 msgstr "leht 2"
 
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Laadimine...</span>"
+
 msgid "The contact is offline"
 msgstr "Kontakt pole võrku ühendatud"
 
@@ -1913,18 +1910,18 @@ msgstr "Uus %s konto"
 msgid "Find:"
 msgstr "Otsi:"
 
+msgid "_Previous"
+msgstr "_Eelmine"
+
+msgid "_Next"
+msgstr "_Järgmine"
+
 msgid "Mat_ch case"
 msgstr "_Tõstutundlik"
 
 msgid "Phrase not found"
 msgstr "Fraasi ei leitud"
 
-msgid "_Next"
-msgstr "_Järgmine"
-
-msgid "_Previous"
-msgstr "_Eelmine"
-
 msgid "Received an instant message"
 msgstr "Võeti vastu välksõnum"
 
@@ -2019,8 +2016,11 @@ msgstr "Oodatud hostinimi: %s"
 msgid "Certificate hostname: %s"
 msgstr "Sertifikaadi hostinimi: %s"
 
-msgid "Continue"
-msgstr "Jätka"
+msgid "C_ontinue"
+msgstr "_Jätka"
+
+msgid "Untrusted connection"
+msgstr "Ebausaldusväärne ühendus"
 
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ühendus pole usaldusväärne. Kas tahad siiski jätkata?"
@@ -2213,130 +2213,6 @@ msgstr ""
 "Ivar Smolin <okul linux ee>, 2005–2011.\n"
 "Mattias Põldaru <mahfiaz gmail com>, 2009–2010."
 
-msgid "There was an error while importing the accounts."
-msgstr "Kontode importimise käigus tekkis viga."
-
-msgid "There was an error while parsing the account details."
-msgstr "Konto üksikasjade analüüsimisel tekkis viga."
-
-msgid "There was an error while creating the account."
-msgstr "Konto loomisel tekkis viga."
-
-msgid "There was an error."
-msgstr "Tekkis viga."
-
-#, c-format
-msgid "The error message was: %s"
-msgstr "Veateade oli: %s"
-
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Sul on võimalik minna tagasi ja proovida uuesti oma konto üksikasju määrata. "
-"Samuti on võimalik seadistamisabiline praegu sulgeda ja lisada kontosid "
-"hiljem (menüüst \"Redaktor\")."
-
-msgid "An error occurred"
-msgstr "Tekkis viga"
-
-msgid "What kind of chat account do you have?"
-msgstr "Mis sorti konto sul on?"
-
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Kas sul on veel mõni konto, mida soovid seadistada?"
-
-msgid "Enter your account details"
-msgstr "Määra oma konto üksikasjad"
-
-msgid "What kind of chat account do you want to create?"
-msgstr "Mis liiki vestluskontot sa soovid luua?"
-
-msgid "Do you want to create other chat accounts?"
-msgstr "Kas soovid luua veel mõne vestlemiskonto?"
-
-msgid "Enter the details for the new account"
-msgstr "Määra uue konto üksikasjad"
-
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy abil saad suhelda lähinaabruses asuvate inimestega, samuti sõprade "
-"ja kolleegidega, kes kasutavad Google Talk-i, AIM-i, Windows Live-i või "
-"teisi rakendusi. Mikrofoni või veebikaameraga võid teha ka tavalisi või "
-"videokõnesid."
-
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Kas sul on juba mõni konto, mida sa mõne teise vestlusprogrammiga kasutad?"
-
-msgid "Yes, import my account details from "
-msgstr "Jah, impordi mu konto andmed rakendusest "
-
-msgid "Yes, I'll enter my account details now"
-msgstr "Jah, ma määran oma konto andmed ise"
-
-msgid "No, I want a new account"
-msgstr "Ei, ma tahan uut kontot"
-
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ei, ma tahan lihtsalt näha, kes mu lähinaabruses asuvad"
-
-msgid "Select the accounts you want to import:"
-msgstr "Vali imporditavad kontod:"
-
-msgid "Yes"
-msgstr "Jah"
-
-msgid "No, that's all for now"
-msgstr "Ei, see on praeguseks kõik"
-
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy võib automaatselt avastada ja võimaldada vestlused inimestega, kes "
-"on samas võrgus. Kui sa tahad seda võimalust, veendu, et allasuvad andmed on "
-"õiged. Neid saab hiljem lihtsalt muuta või kogu selle konto keelata "
-"dialoogist \"Kontod\"."
-
-msgid "Edit->Accounts"
-msgstr "Redaktor->Kontod"
-
-msgid "I do _not want to enable this feature for now"
-msgstr "Ma _ei taha seda võimalust praegu lubada"
-
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Kui telepathy-salut pole paigaldatud, ei saa sa vestelda kohtvõrgus olevate "
-"inimestega. Kui sa tahad seda võimalust kasutada, pead paigaldama telepathy-"
-"salut paketi ja looma kontode dialoogiaknas \"Lähedalasuvate inimeste\" "
-"konto."
-
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut pole paigaldatud"
-
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Sõnumite ja VoIP kontode abiline"
-
-msgid "Welcome to Empathy"
-msgstr "Tere tulemast Empathy kasutajaks"
-
-msgid "Import your existing accounts"
-msgstr "Sinu olemasolevate kontode importimine"
-
-msgid "Please enter personal details"
-msgstr "Palun sisesta isiklikud andmed"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #, c-format
@@ -2365,6 +2241,15 @@ msgstr "Ühendamata — puudub võrguühendus"
 msgid "Unknown Status"
 msgstr "Tundmatu olek"
 
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"See konto on keelatud, kuna see kasutab vana, mitte toetatud tugiprogrammi. "
+"Palun paigalda telepathy-haze ja logi välja ning uuesti sisse, et konto üle "
+"kanda."
+
 msgid "Offline — Account Disabled"
 msgstr "Ühendamata — konto keelatud"
 
@@ -2401,6 +2286,12 @@ msgstr "_Luba"
 msgid "_Disable"
 msgstr "_Keela"
 
+msgid "_Skip"
+msgstr "_Jäta vahele"
+
+msgid "_Connect"
+msgstr "_Ãœhendu"
+
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2411,15 +2302,12 @@ msgstr ""
 msgid "Add…"
 msgstr "Lisa…"
 
+msgid "_Import…"
+msgstr "_Impordi…"
+
 msgid "Loading account information"
 msgstr "Konto andmete laadimine"
 
-msgid "No protocol installed"
-msgstr "Ãœhtegi protokolli pole paigaldatud"
-
-msgid "Protocol:"
-msgstr "Protokoll:"
-
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2427,8 +2315,8 @@ msgstr ""
 "Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, "
 "mida tahad kasutada."
 
-msgid "_Import…"
-msgstr "_Impordi…"
+msgid "No protocol backends installed"
+msgstr "Ãœhtegi protokolli tugiprogrammi pole paigaldatud"
 
 msgid " - Empathy authentication client"
 msgstr " - Empathy autentimisklient"
@@ -2436,9 +2324,6 @@ msgstr " - Empathy autentimisklient"
 msgid "Empathy authentication client"
 msgstr "Empathy autentimisklient"
 
-msgid "People nearby"
-msgstr "Lähedalasuvad inimesed"
-
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video klient"
 
@@ -2455,13 +2340,13 @@ msgid "Gamma"
 msgstr "Gamma"
 
 msgid "Volume"
-msgstr "Valjus"
+msgstr "Helitugevus"
 
 msgid "_Sidebar"
 msgstr "_Külgriba"
 
 msgid "Audio input"
-msgstr "Helisisend"
+msgstr "Audiosisend"
 
 msgid "Video input"
 msgstr "Videosisend"
@@ -2470,7 +2355,7 @@ msgid "Dialpad"
 msgstr "Sõrmlaud"
 
 msgid "Details"
-msgstr "Ãœksikasjad"
+msgstr "Andmed"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
@@ -2550,7 +2435,7 @@ msgid ""
 msgstr ""
 "Telepathy komponendiga juhtus midagi ootamatut. Palun <a href=\"%s"
 "\">raporteeri sellest veast</a> ja lisa manusena logid, mille saad "
-"'Silumine' nupu alt abimenüüst."
+"'Silumise' nupu alt abimenüüst."
 
 msgid "There was a failure in the call engine"
 msgstr "Helistamismootoris esines viga"
@@ -2564,47 +2449,50 @@ msgstr "Helivoogu pole võimalik alustada"
 msgid "Can't establish video stream"
 msgstr "Videovoogu pole võimalik alustada"
 
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Helista"
 
-msgid "Decoding Codec:"
-msgstr "Dekodeeriv koodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
-msgid "Disable camera"
-msgstr "Keela kaamera"
+msgid "_Camera"
+msgstr "_Kaamera"
 
-msgid "Display the dialpad"
-msgstr "Kuva sõrmlaud"
+msgid "_Settings"
+msgstr "_Seaded"
 
-msgid "Encoding Codec:"
-msgstr "Kodeeriv koodek:"
+msgid "_View"
+msgstr "_Vaade"
 
-msgid "Hang up"
-msgstr "Toru hargile"
+msgid "_Help"
+msgstr "A_bi"
 
-msgid "Hang up current call"
-msgstr "Praeguse kõne lõpetamine"
+msgid "_Contents"
+msgstr "_Sisukord"
 
-msgid "Local Candidate:"
-msgstr "Kohalik kandidaat:"
+msgid "_Debug"
+msgstr "Si_lumine"
 
-msgid "Maximise me"
-msgstr "Maksimeeri mind"
+msgid "Swap camera"
+msgstr "Kaamera vahetamine"
 
 msgid "Minimise me"
 msgstr "Minimeeri mind"
 
-msgid "Remote Candidate:"
-msgstr "Kaugkandidaat:"
+msgid "Maximise me"
+msgstr "Maksimeeri mind"
 
-msgid "Send Audio"
-msgstr "Saada heli"
+msgid "Disable camera"
+msgstr "Keela kaamera"
 
-msgid "Send Video"
-msgstr "Video saatmine"
+msgid "Hang up"
+msgstr "Toru hargile"
 
-msgid "Show dialpad"
-msgstr "Sõrmlaua näitamine"
+msgid "Hang up current call"
+msgstr "Praeguse kõne lõpetamine"
+
+msgid "Video call"
+msgstr "Videokõne"
 
 msgid "Start a video call"
 msgstr "Videokõne alustamine"
@@ -2612,44 +2500,81 @@ msgstr "Videokõne alustamine"
 msgid "Start an audio call"
 msgstr "Audiokõne alustamine"
 
-msgid "Swap camera"
-msgstr "Kaamera vahetamine"
+msgid "Show dialpad"
+msgstr "Sõrmlaua näitamine"
 
-msgid "Toggle audio transmission"
-msgstr "Heliedastuse lüliti"
+msgid "Display the dialpad"
+msgstr "Kuva sõrmlaud"
+
+msgid "Send Video"
+msgstr "Video saatmine"
 
 msgid "Toggle video transmission"
 msgstr "Videoedastuse lüliti"
 
+msgid "Send Audio"
+msgstr "Saada heli"
+
+msgid "Toggle audio transmission"
+msgstr "Heliedastuse lüliti"
+
+msgid "Encoding Codec:"
+msgstr "Kodeeriv koodek:"
+
 msgid "Unknown"
 msgstr "Tundmatu"
 
-msgid "Video call"
-msgstr "Videokõne"
+msgid "Decoding Codec:"
+msgstr "Dekodeeriv koodek:"
 
-msgid "_Call"
-msgstr "_Helista"
+msgid "Remote Candidate:"
+msgstr "Kaugkandidaat:"
 
-msgid "_Camera"
-msgstr "_Kaamera"
+msgid "Local Candidate:"
+msgstr "Kohalik kandidaat:"
 
-msgid "_Contents"
-msgstr "_Sisukord"
+msgid "Audio"
+msgstr "Audio"
 
-msgid "_Debug"
-msgstr "Si_lumine"
+msgid "Close this window?"
+msgstr "Kas sulgeda see aken?"
 
-msgid "_Help"
-msgstr "A_bi"
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Selle akna sulgemisega lahkud %s võrgust. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
 
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Selle akna sulgemisega lahkud jututoast. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
+msgstr[1] ""
+"Selle akna sulgemisega lahkud %u jututoast. Kuni uuesti ühendumiseni ei saa "
+"sa ühtegi teadet."
+
+#, c-format
+msgid "Leave %s?"
+msgstr "Kas lahkuda toast %s?"
 
-msgid "_Settings"
-msgstr "_Seaded"
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Kuni uuesti ühendumiseni ei saa sa sellest jututoast ühtegi teadet."
 
-msgid "_View"
-msgstr "_Vaade"
+msgid "Close window"
+msgstr "Sulge aken"
+
+msgid "Leave room"
+msgstr "Lahku toast"
 
 #, c-format
 msgid "%s (%d unread)"
@@ -2687,51 +2612,51 @@ msgstr[1] "%d sõnumi saatmine"
 msgid "Typing a message."
 msgstr "Kirjutab sõnumit."
 
+msgid "_Conversation"
+msgstr "_Vestlus"
+
 msgid "C_lear"
 msgstr "_Puhasta"
 
-msgid "C_ontact"
-msgstr "_Kontakt"
-
 msgid "Insert _Smiley"
 msgstr "Lisa _tujunägu"
 
-msgid "Invite _Participant…"
-msgstr "Kutsu _osaline…"
-
-msgid "Move Tab _Left"
-msgstr "Tõsta kaart _vasakule"
-
-msgid "Move Tab _Right"
-msgstr "Tõsta kaart _paremale"
+msgid "_Favorite Chat Room"
+msgstr "_Lemmikjututuba"
 
 msgid "Notify for All Messages"
 msgstr "Teavitamine kõigist sõnumitest"
 
-msgid "_Conversation"
-msgstr "_Vestlus"
+msgid "_Show Contact List"
+msgstr "_Sõbranimekirja näidatakse"
 
-msgid "_Detach Tab"
-msgstr "_Haagi kaart lahti"
+msgid "Invite _Participant…"
+msgstr "Kutsu _osaline…"
 
-msgid "_Favorite Chat Room"
-msgstr "_Lemmikjututuba"
+msgid "C_ontact"
+msgstr "_Kontakt"
 
-msgid "_Next Tab"
-msgstr "_Järgmine kaart"
+msgid "_Tabs"
+msgstr "_Sakid"
 
 msgid "_Previous Tab"
 msgstr "_Eelmine kaart"
 
-msgid "_Show Contact List"
-msgstr "_Sõbranimekirja näidatakse"
-
-msgid "_Tabs"
-msgstr "_Sakid"
+msgid "_Next Tab"
+msgstr "_Järgmine kaart"
 
 msgid "_Undo Close Tab"
 msgstr "_Võta saki sulgemine tagasi"
 
+msgid "Move Tab _Left"
+msgstr "Tõsta kaart _vasakule"
+
+msgid "Move Tab _Right"
+msgstr "Tõsta kaart _paremale"
+
+msgid "_Detach Tab"
+msgstr "_Haagi kaart lahti"
+
 msgid "Name"
 msgstr "Nimi"
 
@@ -2908,6 +2833,9 @@ msgstr "Failiülekanded"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Lõpetatud, katkestatud ja nurjunud failide eemaldamine loendist"
 
+msgid "_Import"
+msgstr "_Impordi"
+
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2934,6 +2862,9 @@ msgstr "Parooli sisestamine"
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
+msgid "You need to setup an account to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead mõne konto seadistama."
+
 msgid "No match found"
 msgstr "Vastavust ei leitud"
 
@@ -2956,7 +2887,7 @@ msgid "Edit Account"
 msgstr "Konto redigeerimine"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
+#. * Top up My Account ($1.23)..."
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Lae %s kontot (%s)..."
@@ -2971,38 +2902,55 @@ msgstr "Lae kontot..."
 msgid "Contact"
 msgstr "Kontakt"
 
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead lubama vähemalt ühe oma kontodest."
+
+#. translators: argument is an account name
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Pead lubama %s konto, et näha siin kontakte."
+
 msgid "Contact List"
 msgstr "Kontaktide nimekiri"
 
-msgid "Contacts on a _Map"
-msgstr "Kontaktid _kaardil"
+msgid "Account settings"
+msgstr "Konto sätted"
 
-msgid "Credit Balance"
-msgstr "Kontojääk"
+msgid "_New Conversation…"
+msgstr "_Uus vestlus…"
 
-msgid "Find in Contact _List"
-msgstr "_Otsi kontaktide nimekirjast"
+msgid "New _Call…"
+msgstr "Uus _kõne…"
 
-msgid "Join _Favorites"
-msgstr "Ãœhine _lemmiktubadega"
+msgid "_Search for Contacts…"
+msgstr "_Otsi kontakte…"
 
-msgid "Manage Favorites"
-msgstr "Lemmiktubade haldamine"
+msgid "_File Transfers"
+msgstr "_Failiülekanded"
 
-msgid "N_ormal Size"
-msgstr "No_rmaalsuurus"
+msgid "_Offline Contacts"
+msgstr "Ü_hendamata kontaktid"
 
-msgid "New _Call…"
-msgstr "Uus _kõne…"
+msgid "Show P_rotocols"
+msgstr "Kuva _protokolle"
 
-msgid "Normal Size With _Avatars"
-msgstr "Normaalsuurus _avataridega"
+msgid "Credit Balance"
+msgstr "Kontojääk"
+
+msgid "Contacts on a _Map"
+msgstr "Kontaktid _kaardil"
+
+msgid "_Accounts"
+msgstr "_Kontod"
+
+msgid "_Blocked Contacts"
+msgstr "_Blokitud kontaktid"
 
 msgid "P_references"
 msgstr "_Eelistused"
 
-msgid "Show P_rotocols"
-msgstr "Kuva _protokolle"
+msgid "Find in Contact _List"
+msgstr "_Otsi kontaktide nimekirjast"
 
 msgid "Sort by _Name"
 msgstr "Sortimine _nime järgi"
@@ -3010,35 +2958,26 @@ msgstr "Sortimine _nime järgi"
 msgid "Sort by _Status"
 msgstr "Sortimine _oleku järgi"
 
-msgid "_Accounts"
-msgstr "_Kontod"
+msgid "Normal Size With _Avatars"
+msgstr "Normaalsuurus _avataridega"
 
-msgid "_Blocked Contacts"
-msgstr "_Blokitud kontaktid"
+msgid "N_ormal Size"
+msgstr "No_rmaalsuurus"
 
 msgid "_Compact Size"
 msgstr "_Kompaktne"
 
-msgid "_File Transfers"
-msgstr "_Failiülekanded"
+msgid "_Room"
+msgstr "_Tuba"
 
 msgid "_Join…"
 msgstr "Ü_hine…"
 
-msgid "_New Conversation…"
-msgstr "_Uus vestlus…"
-
-msgid "_Offline Contacts"
-msgstr "Ü_hendamata kontaktid"
-
-msgid "_Personal Information"
-msgstr "_Isiklikud andmed"
-
-msgid "_Room"
-msgstr "_Tuba"
+msgid "Join _Favorites"
+msgstr "Ãœhine _lemmiktubadega"
 
-msgid "_Search for Contacts…"
-msgstr "_Otsi kontakte…"
+msgid "Manage Favorites"
+msgstr "Lemmiktubade haldamine"
 
 msgid "Chat Room"
 msgstr "Jututuba"
@@ -3060,6 +2999,9 @@ msgstr ""
 "Nõutakse parooli: %s\n"
 "Liikmeid: %s"
 
+msgid "Yes"
+msgstr "Jah"
+
 msgid "No"
 msgstr "Ei"
 
@@ -3069,8 +3011,8 @@ msgstr "Tubade nimekirja pole võimalik alustada"
 msgid "Could not stop room listing"
 msgstr "Tubade nimekirja pole võimalik lõpetada"
 
-msgid "Couldn't load room list"
-msgstr "Tubade nimekirja pole võimalik laadida"
+msgid "Join Room"
+msgstr "Toaga ühinemine"
 
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
@@ -3078,6 +3020,9 @@ msgstr ""
 "Sisesta jututoa nimi, millega tahad liituda, või klõpsa loendis oleva toa "
 "nimele."
 
+msgid "_Room:"
+msgstr "_Tuba:"
+
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -3085,15 +3030,12 @@ msgstr ""
 "Sisesta server, mis võõrustab jututuba, või jäta tühjaks, kui tuba on "
 "praeguse konto serveris"
 
-msgid "Join Room"
-msgstr "Toaga ühinemine"
+msgid "Couldn't load room list"
+msgstr "Tubade nimekirja pole võimalik laadida"
 
 msgid "Room List"
 msgstr "Tubade nimekiri"
 
-msgid "_Room:"
-msgstr "_Tuba:"
-
 msgid "Message received"
 msgstr "Sõnumi vastuvõtmine"
 
@@ -3103,7 +3045,7 @@ msgstr "Sõnumi saatmine"
 msgid "New conversation"
 msgstr "Uus vestlus"
 
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakti sisenemine"
 
 msgid "Contact goes offline"
@@ -3153,23 +3095,71 @@ msgstr "Julia lahkus"
 msgid "Preferences"
 msgstr "Eelistused"
 
+msgid "Show _smileys as images"
+msgstr "_Tujunägusid näidatakse piltidena"
+
+msgid "Show contact _list in rooms"
+msgstr "Jututubades näidatakse kontaktide _loendit"
+
 msgid "Appearance"
 msgstr "Välimus"
 
+msgid "Start chats in:"
+msgstr "Jututoad asuvad:"
+
+msgid "new ta_bs"
+msgstr "uutel _kaartidel"
+
+msgid "new _windows"
+msgstr "uutes _akendes"
+
+msgid "Display incoming events in the notification area"
+msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+
+msgid "_Automatically connect on startup"
+msgstr "_Käivitumisel ühendutakse automaatselt"
+
+msgid "Log conversations"
+msgstr "Vestluseid logitakse"
+
 msgid "Behavior"
 msgstr "Käitumine"
 
-msgid "Chat Th_eme:"
-msgstr "Vestluse _teema:"
+msgid "General"
+msgstr "Ãœldine"
+
+msgid "_Enable bubble notifications"
+msgstr "_Teatemullid on lubatud"
 
 msgid "Disable notifications when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on teated keelatud"
 
+msgid "Enable notifications when the _chat is not focused"
+msgstr "_Fokuseerimata jututoa teated on lubatud"
+
+msgid "Enable notifications when a contact comes online"
+msgstr "Teatatakse kontakti sisenemisest"
+
+msgid "Enable notifications when a contact goes offline"
+msgstr "Teatatakse kontakti väljumisest"
+
+msgid "Notifications"
+msgstr "Teavitamisviisid"
+
+msgid "_Enable sound notifications"
+msgstr "_Heliteated on lubatud"
+
 msgid "Disable sounds when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on helid keelatud"
 
-msgid "Display incoming events in the notification area"
-msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+msgid "Play sound for events"
+msgstr "Helisid esitatakse järgnevate sündmuste puhul"
+
+msgid "Sounds"
+msgstr "Helid"
+
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
 
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
@@ -3182,35 +3172,8 @@ msgstr ""
 "kuuleb imelikku müra või krõpse kõne ajal, proovi kaja vähendamine välja "
 "lülitada ja helista uuesti."
 
-msgid "Enable notifications when a contact comes online"
-msgstr "Teatatakse kontakti sisenemisest"
-
-msgid "Enable notifications when a contact goes offline"
-msgstr "Teatatakse kontakti väljumisest"
-
-msgid "Enable notifications when the _chat is not focused"
-msgstr "_Fokuseerimata jututoa teated on lubatud"
-
-msgid "Enable spell checking for languages:"
-msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
-
-msgid "General"
-msgstr "Ãœldine"
-
-msgid "Location sources:"
-msgstr "Asukohaallikad:"
-
-msgid "Log conversations"
-msgstr "Vestluseid logitakse"
-
-msgid "Notifications"
-msgstr "Teavitamisviisid"
-
-msgid "Play sound for events"
-msgstr "Helisid esitatakse järgnevate sündmuste puhul"
-
-msgid "Privacy"
-msgstr "Privaatsus"
+msgid "_Publish location to my contacts"
+msgstr "_Minu asukoht avaldatakse kontaktidele"
 
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
@@ -3220,17 +3183,24 @@ msgstr ""
 "Vähendatud asukoha täpsuse korral avaldatakse ainult linn, maakond ja riik. "
 "GPSi laius- ja pikkuskraadid ümardatakse kümnendkohani."
 
-msgid "Show _smileys as images"
-msgstr "_Tujunägusid näidatakse piltidena"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+msgid "_Reduce location accuracy"
+msgstr "_Asukoha täpsust vähendatakse"
 
-msgid "Show contact _list in rooms"
-msgstr "Jututubades näidatakse kontaktide _loendit"
+msgid "Privacy"
+msgstr "Privaatsus"
 
-msgid "Sounds"
-msgstr "Helid"
+msgid "_GPS"
+msgstr "_GPS"
 
-msgid "Spell Checking"
-msgstr "Õigekirjakontroll"
+msgid "_Cellphone"
+msgstr "_Mobiiltelefon"
+
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Võrk (IP, Wi-Fi)"
+
+msgid "Location sources:"
+msgstr "Asukohaallikad:"
 
 msgid ""
 "The list of languages reflects only the languages for which you have a "
@@ -3239,84 +3209,62 @@ msgstr ""
 "Keelte nimekiri kajastab ainult neid keeli, mille jaoks on paigaldatud "
 "sõnastik."
 
-msgid "Themes"
-msgstr "Teemad"
+msgid "Enable spell checking for languages:"
+msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
 
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
+msgid "Spell Checking"
+msgstr "Õigekirjakontroll"
+
+msgid "Chat Th_eme:"
+msgstr "Vestluse _teema:"
 
 msgid "Variant:"
 msgstr "Variant:"
 
-msgid "_Automatically connect on startup"
-msgstr "_Käivitumisel ühendutakse automaatselt"
-
-msgid "_Cellphone"
-msgstr "_Mobiiltelefon"
-
-msgid "_Enable bubble notifications"
-msgstr "_Teatemullid on lubatud"
-
-msgid "_Enable sound notifications"
-msgstr "_Heliteated on lubatud"
+msgid "Themes"
+msgstr "Teemad"
 
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Status"
+msgstr "Olek"
 
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Võrk (IP, Wi-Fi)"
+msgid "_Quit"
+msgstr "_Lõpeta"
 
-msgid "_Open new chats in separate windows"
-msgstr "_Uued vestlused avanevad eraldi akendes"
+msgid "Redial"
+msgstr "Vali uuesti"
 
-msgid "_Publish location to my contacts"
-msgstr "_Minu asukoht avaldatakse kontaktidele"
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-msgid "_Reduce location accuracy"
-msgstr "_Asukoha täpsust vähendatakse"
+msgid "Video Off"
+msgstr "Video välja"
 
-msgid "Status"
-msgstr "Olek"
+msgid "Video Preview"
+msgstr "Video eelvaade"
 
-msgid "_Quit"
-msgstr "_Lõpeta"
+msgid "Video On"
+msgstr "Video sisse"
 
 msgid "Call the contact again"
-msgstr "Helista kontaktile uuesti"
+msgstr "Kontaktile uuesti helistamine"
 
 msgid "Camera Off"
-msgstr "Kaamera väljas"
-
-msgid "Camera On"
-msgstr "Kaamera sees"
+msgstr "Kaamera välja"
 
 msgid "Disable camera and stop sending video"
-msgstr "Kaamera keelamine ja video saatmise lõpetamine"
-
-msgid "Enable camera and send video"
-msgstr "Kaamera lubamine ja video saatmine"
-
-msgid "Enable camera but don't send video"
-msgstr "Kaamera lubamine ilma video saatmiseta"
+msgstr "Kaamera väljalülitamine ja video saatmise lõpetamine"
 
 msgid "Preview"
 msgstr "Eelvaade"
 
-msgid "Redial"
-msgstr "Vali uuesti"
-
-msgid "V_ideo"
-msgstr "V_ideo"
-
-msgid "Video Off"
-msgstr "Video väljas"
+msgid "Enable camera but don't send video"
+msgstr "Kaamera sisselülitamine, kuid videot ei saadeta"
 
-msgid "Video On"
-msgstr "Video sees"
+msgid "Camera On"
+msgstr "Kaamera sisse"
 
-msgid "Video Preview"
-msgstr "Video eelvaade"
+msgid "Enable camera and send video"
+msgstr "Kaamera sisselülitamine ja video saatmine"
 
 msgid "Contact Map View"
 msgstr "Kontaktide kaardivaade"
@@ -3324,9 +3272,26 @@ msgstr "Kontaktide kaardivaade"
 msgid "Save"
 msgstr "Salvesta"
 
+msgid "Pastebin link"
+msgstr "Pastebin'i link"
+
+msgid "Pastebin response"
+msgstr "Pastebin'i vastus"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Andmeid on ühe postituse jaoks liiga palju. Palun salvesta oma logid faili."
+
 msgid "Debug Window"
 msgstr "Silumisaken"
 
+msgid "Send to pastebin"
+msgstr "Saada pastebin'i"
+
 msgid "Pause"
 msgstr "Pausi"
 
@@ -3394,9 +3359,6 @@ msgstr "Alguses vali antud konto (nt. gabble/jabber/mingi_40näidis_2eorg0)"
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-msgid "Show account assistant"
-msgstr "Kontoabilise näitamine"
-
 msgid "- Empathy Accounts"
 msgstr "- Empathy kontod"
 
@@ -3475,5 +3437,27 @@ msgstr "Lae kontot"
 msgid "_Match case"
 msgstr "_Tõstutundlik"
 
+msgid "What kind of chat account do you have?"
+msgstr "Mis sorti konto sul on?"
+
 msgid "Adding new account"
 msgstr "Uue konto lisamine"
+
+msgid "People nearby"
+msgstr "Lähedalasuvad inimesed"
+
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy võib automaatselt avastada samas võrgus asuvad inimesed, et nendega "
+"saaks vestelda. Kui sa tahad seda võimalust, veendu, et all asuvad andmed on "
+"õiged."
+
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Sa võid üksikasju hiljem muuta või selle võimaluse keelata valides "
+"sõbranimekirjas <span style=\"italic\">Redaktor → Kontod</span>."
diff --git a/po/eu.po b/po/eu.po
index 21fc60df9..c60161845 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,15 +4,15 @@
 # This file is distributed under the same license as the gossip package.
 #
 # Mikel Olasagasti <hey_neken@mundurat.net>, 2003.
-# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 16:22+0200\n"
-"PO-Revision-Date: 2011-09-24 16:17+0200\n"
-"Last-Translator: \n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2012-03-07 11:23+0100\n"
+"PO-Revision-Date: 2012-03-07 11:29+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
+"Language-Team: American English <itzulpena@euskalgnu.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,27 +41,29 @@ msgstr "Empathy interneteko mezularitza"
 msgid "IM Client"
 msgstr "BM bezeroa"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Mezularitzako eta VoIP-ko kontuak"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Ireki beti berriketa berriak beste leiho batean."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Deiaren bolumena"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Deiaren bolumena (ehunekotan)."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Kameraren gailua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Kameraren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -69,54 +71,60 @@ msgstr ""
 "Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
 "osatzea (tabuladorea) erabiltzean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Berriketako leihoaren gaia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Berriketako leihoaren gai aldakorra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
 "zerrenda (adib. \"de, ca, eu\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Trinkotu kontaktu-zerrenda"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Sare-kudeatzaileak erabili beharko lirateke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Hautatutako azken kontuaren D-Bus objektuaren bide-izena gela batera "
+"elkartzeko."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Kameraren gailu lehenetsia bideo-deiak egiteko. Adib. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Direktorio lehenetsia avatar baten irudia hautatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Desgaitu soinuak aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Bistaratu sarrerako gertaerak egoeraren arean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -124,254 +132,261 @@ msgstr ""
 "Bistaratu sarrerako gertaerak egoeraren arean. False (faltsua) bada, "
 "erakutsi hauek erabiltzaileari berehala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Oihartzuna ezeztatzeko euskarria"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy-ren deskargen karpeta lehenetsia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Gaitu WebKit garatzaileen tresnak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Gaitu ortografia-egiaztapena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Ezkutatu leiho nagusia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Ezkutatu leiho nagusia."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informatu beste erabiltzaileei haiei idazten ari zarenean"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "'Elkartu gelara' elkarrizketa-koadroan hautatutako azken kontua"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Zenbaki magikoa garbiketako atazak exekutatu behar diren begiratzeko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Goitizena osatzeko karakterea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Ireki berriketa berriak beste leihoetan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Bide-izena Adium gaia erabiltzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Jo soinua mezuak iristean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Jo soinua solasaldi berrietan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Jo soinua mezuak bidaltzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Jo soinua kontaktu batek saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Jo soinua kontaktu batek saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Jo soinua zuk saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Jo soinua zuk saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Kameraren aurrebista zein posiziotan egongo den deian zehar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Erakutsi balantzea kontaktuen zerrendan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Erakutsi avatar-ak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Show contact groups"
+msgstr "Erakutsi kontaktuen taldeak"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show contact list in rooms"
 msgstr "Erakutsi kontaktu-zerrenda geletan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show hint about closing the main window"
 msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show offline contacts"
 msgstr "Erakutsi konektatu gabeko kontaktuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Show protocols"
 msgstr "Erakutsi protokoloak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Spell checking languages"
 msgstr "Hizkuntzen zuzentzailea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The default folder to save file transfers in."
 msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The position for the chat window side pane"
 msgstr "Berriketako leihoaren alboko panelaren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Gaia solasaldian bistaratzeko (berriketako leihoan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Gai aldakorra solasaldian bistaratzeko (berriketako leihoetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use graphical smileys"
 msgstr "Erabili aurpegierak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use notification sounds"
 msgstr "Erabili jakinarazpen-soinuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Use theme for chat rooms"
 msgstr "Erabili gaia berriketa-gelan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
-"Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten du."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
 "dagoenean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
 "ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
 "ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -379,78 +394,86 @@ msgstr ""
 "Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
 "den edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
 "hizkuntzetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Solasaldietan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Pulseaudio-ren oihartzuna ezeztatzeko iragazkia gaitu edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of events."
 msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Solasaldi berriak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging into a network."
 msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"berriketako 'konposatzen' edo 'pausatuta' egoerak bidaliko diren edo ez. Ez "
+"dio 'joanda' egoerari eragiten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
 "erakutsiko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -459,51 +482,55 @@ msgstr ""
 "adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
 "egon)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show account balances in the contact list."
 msgstr ""
 "Kontaktuen zerrendan kontuaren balantzea erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
 "ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show groups in the contact list."
+msgstr "Taldeak kontaktuen zerrendan erakutsiko diren edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
 "edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the contact list in compact mode."
 msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -511,47 +538,74 @@ msgstr ""
 "Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
 "koadroa erakutsi ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether to use the theme for chat rooms."
 msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Zein irizpide erabiliko den kontaktu-zerrenda ordenatzean. Lehenetsia "
-"kontaktuen izenen arabera ordenatzea da \"name\" (izena) balioarekin. \"state"
-"\" (egoera)balioak kontaktu-zerrenda egoeraren arabera ordenatuko du."
+"kontaktuen egoeren arabera ordenatzea da \"state\" (egoera) balioarekin. "
+"\"name\" (izena) balioak kontaktu-zerrenda izenaren arabera ordenatuko du."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"'empathy-sanity-cleaning.c'-k  zenbaki hau erabiltzen du "
+"garbiketako atazak exekutatu behar diren edo ez begiratzeko. "
+"Ez da komeni erabiltzaileek gako hau eskuz aldatzea."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Mezularitzako eta VoIP-ko kontuak"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ez da arrazoirik zehaztu"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Egoeraren aldaketa eskatu da"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Errorea fitxategia transferitzen saiatzean"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Beste partaide batek ezin du fitxategia transferitu"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Arrazoi ezezaguna"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Fitxategi-transferentzia osatuta, baina fitxategia hondatuta dago"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Hautatutako fitxategia hutsik dago"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Galdutako deia %s(e)ndik"
@@ -567,171 +621,140 @@ msgstr "%s(e)k deitu du"
 msgid "Call from %s"
 msgstr "%s(e)tik deia"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Socket mota ez dago onartuta"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Ez da arrazoirik zehaztu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Egoeraren aldaketa eskatu da"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Errorea fitxategia transferitzen saiatzean"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Beste partaide batek ezin du fitxategia transferitu"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Astiarekin"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Aldendua"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Ikusezina"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Deskonektatuta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ez da arrazoirik zehaztu"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Egoera lineaz kanpo gisa ezarri da"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Sareko errorea"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentifikazioak huts egin du"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Enkriptazioaren errorea"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Izena erabilita"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Ez da ziurtagiririk eman"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Ziurtagiria iraungituta"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Ziurtagiria aktibatu gabe"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Ziurtagiriaren hatz-marka ez dator bat"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Ziurtagiria bere buruarekin sinatuta"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Ziurtagiriaren errorea"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Enkriptatzea ez dago erabilgarri"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Ziurtagiria baliogabea da"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Konexioa ukatu egin da"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Konexioa ezin da ezarri"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Konexioa galdu egin da"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Baliabidea jadanik zerbitzariarekin konektatuta dago"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Kontu hau jadanik zerbitzariarekin konektatuta dago"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Zerbitzaria oso lanpetuegia dago konexioa kudeatzeko"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Ziurtagiria errebokatu egin da"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Ziurtagiriak zifratzeko algoritmo ez-segurua darabil, edo kriptografikoki "
 "ahula da"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -739,165 +762,144 @@ msgstr ""
 "Zerbitzariaren ziurtagiriaren luzerak, edo zerbitzariaren ziurtagiriaren "
 "katearen sakonerak, liburutegi kriptografikoak ezartzen duen muga gainditu du"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Darabilzun softwarea zaharregia da"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Barneko errorea"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Inguruko jendea"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Japoniako Yahoo!"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook berriketa"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Duela segundo %d"
 msgstr[1] "Duela %d segundo"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Duela minutu %d"
 msgstr[1] "Duela %d minutu"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Duela ordu %d"
 msgstr[1] "Duela %d ordu"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Duela egun %d"
 msgstr[1] "Duela %d egun"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Duela aste %d"
 msgstr[1] "Duela %d aste"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Duela hilabete %d"
 msgstr[1] "Duela %d hilabete"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "etorkizunean"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kontu guztiak"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ataka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Nire Web Kontuak"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s kontua '%s' bidez editatu da."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s kontua ezin da Empathy-n editatu."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Abiarazi 'Nire Web Kontuak'"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Editatu %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Aplikatu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Saio-hasiera"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Sortu kontu berria zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Utzi"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s - %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Kontu berria"
 
@@ -945,7 +947,7 @@ msgstr "Gogoratu pasahitza"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Gogoratu pasahitza"
 
@@ -1271,7 +1273,7 @@ msgid "STUN Server:"
 msgstr "STUN zerbitzaria:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
@@ -1352,61 +1354,65 @@ msgstr "Fitxategi denak"
 msgid "Click to enlarge"
 msgstr "Egin klik handitzeko"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Errore bat gertatu da deia hastean"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Zehaztutako kontaktuak ez dauka deien euskarririk"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Zehaztutako kontaktua lineaz kanpo dago."
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Zehaztutako kontaktua ez da baliozkoa"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Protokolo honek ez du larrialdietarako deirik onartzen"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Ez daukazu nahikoa krediturik dei hau egiteko"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Huts egin du berriketa pribatua irekitzean"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Gaia ez dago onartuta solasaldi honetan"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Ez duzu baimenik gaia aldatzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "'%s' ez da baliozko IDa"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: mezu guztiak garbitzen ditu uneko solasaldian"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <gaia>: ezarri uneko solasaldiaren gaia"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1414,23 +1420,23 @@ msgstr ""
 "/part [<berriketa-gelaren IDa>] [<arrazoia>]: utzi berriketa-gela, lehenetsi "
 "gisa unekoa"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mezua>: bidali ekintzaren mezua uneko solasaldira"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1440,11 +1446,11 @@ msgstr ""
 "karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
 "say /join berriketa-gela berri batekin elkartzeko erabiltzen da\""
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontaktuaren IDa>: bistaratu kontaktuari buruzko informazioa"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1452,113 +1458,128 @@ msgstr ""
 "/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
 "definitzen bada, nola erabiltzen den erakusten du."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Erabilera: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Komando ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ez dago nahikoa balantzerik mezua bidaltzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Errorea '%s' mezua bidaltzean: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errorea mezua bidaltzean: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"ez dago nahikoa balantzerik mezua bidaltzeko. <a href='%s'>Berriro kargatu</"
+"a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ez da gai"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "lineaz kanpo"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "kontaktu baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "mezua luzeegia"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "inplementatu gabe"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Errorea '%s' mezua bidaltzean: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Errorea mezua bidaltzean: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Gaia:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Gaia honela ezarria: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s(e)k gaia honela ezarri du: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Ez da gairik definitu"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Iradokizunik ez)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Gehitu '%s' '%s' hiztegiari"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Bidali"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Iradokizun _ortografikoak"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Huts egin du azken erregistroak eskuratzean"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s deskonektatu egin da"
@@ -1566,12 +1587,12 @@ msgstr "%s deskonektatu egin da"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s(e)k %1$s kanporatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kanporatua izan da"
@@ -1579,17 +1600,17 @@ msgstr "%s kanporatua izan da"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s(e)k %1$s debekatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s debekatua izan da"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s(e)k gela utzi du"
@@ -1599,17 +1620,17 @@ msgstr "%s(e)k gela utzi du"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s(e)k gelara elkartzea nahi du"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s orain honela ezagutzen da: %s"
@@ -1617,88 +1638,88 @@ msgstr "%s orain honela ezagutzen da: %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Pasahitz hau gordetzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Orain ez"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Saiatu berriro"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Okerreko pasahitza, saiatu berriro:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Gela hau pasahitz batekin babestuta dago:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Elkartu"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Solasaldia"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Identifikatzaile ezezaguna edo baliogabea"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri aldi baterako"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ezin izan da kontaktua blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Editatu blokeatutako kontaktuak"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1710,64 +1731,55 @@ msgstr "Blokeatutako kontaktuak"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Kendu"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiatu estekaren helbidea"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ireki esteka"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %Y %B %d"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editatu kontaktuaren informazioa"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informazio pertsonala"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokeatu %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ziur zaude '%s' blokeatzea nahi duzula zurekin berriro harremanetan ez "
 "jartzeko?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Salatu kontaktu hau iraingarri gisa"
@@ -1785,349 +1797,268 @@ msgstr "Harpidetza eskaera"
 msgid "_Block User"
 msgstr "_Blokeatu erabiltzailea"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Banatuta"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Gogoko jendea"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Taldea kentzen"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Kendu"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Kontaktua kentzen"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Gehitu _kontaktua..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokeatu kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Berriketa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio-deia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Bideo-deia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Aurreko solasaldiak"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Bidali fitxategia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Partekatu nire mahaigaina"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Gogokoa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Informazioa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editatu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Gela honetara gonbidatzen zaituzte"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Gonbidatu berriketa-gelara"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Bilatu kontaktuak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Bilatu: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Gehitu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ez da kontakturik aurkitu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Zure mezua zeure burua aurkeztuz:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Utzidazu ikusten linean zaudenean. Mila esker."
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Hautatu kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Izen osoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefono zenbakia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Helbide elektronikoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webgunea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Urtebetetzea:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ikusi zen azken aldia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Hemendik konektatuta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Kanpoan nagoeneko mezua:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanalak:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Herrialdearen ISO kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Herrialdea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Estatua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Herria:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Posta-kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Kalea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Eraikuntza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Solairua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Testua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Zehaztasun maila:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Errorea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Errore bertikala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Errore horizontala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Atzerapena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Igoerako abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Azken eguneraketa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Kokalekua"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y/%B/%e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gorde avatar-a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ezin da avatar-a gorde"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Xehetasun pertsonalak"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Izen-deiturak"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefono-zenbakia"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Helbide elektronikoa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webgunea"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Urtebetetzea"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Ikusi zen azken aldia:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Hemendik konektatuta:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Kanpoan nagoeneko mezua:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "lana"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "etxea"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mugikorra"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "ahotsa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "hobetsia"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "posta"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "taldea"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Kokalekua</b> (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Aliasa:"
 
@@ -2139,15 +2070,10 @@ msgstr "Bezeroaren informazioa"
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuaren xehetasunak"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikatzailea:"
 
@@ -2164,11 +2090,11 @@ msgstr "SE:"
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Taldeak"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2176,105 +2102,170 @@ msgstr ""
 "Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
 "gehiago hauta ditzakezu, edo talderik ez."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Gehitu taldea"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Honako identitatea blokeatu egingo da:"
 msgstr[1] "Honako identitateak blokeatu egingo dira:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Honako identitatea ezingo da blokeatu:"
 msgstr[1] "Honako identitateak ezingo dira blokeatu:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Estekatutako kontaktuak"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Hautatu kontaktuak estekatzeko"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Kontaktu berriaren aurrebista"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editatu kontaktuaren informazioa"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Hautatu kontua deia egitean erabiltzeko"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Deitu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Lana"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Etxea"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokeatu kontaktua"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Berriketa"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio-deia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Bideo-deia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Aurreko solasaldiak"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Bidali fitxategia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Partekatu nire mahaigaina"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Gogokoa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ez dago instalatuta"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalatu gnome-contacts kontaktuen xehetasunak atzitzeko."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Informazioa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editatu"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Konektatu kontaktuak..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Gela honetara gonbidatzen zaituzte"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Gonbidatu berriketa-gelara"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "Gehitu _kontaktua..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Ezabatu eta _blokeatu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Taldea kentzen"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Kendu"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2284,7 +2275,11 @@ msgstr ""
 "estekatutako kontaktu hau osatzen dituzten kontaktu guztiak ezabatuko "
 "dituela."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Kontaktua kentzen"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2299,19 +2294,19 @@ msgstr "<b>Kokalekua</b> (data)"
 msgid "Online from a phone or mobile device"
 msgstr "Linean telefono edo mugikor gailu batetik"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Sare berria"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Aukeratu IRC sarea"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Berrezarri _sareen zerrenda"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Hautatu"
@@ -2324,181 +2319,136 @@ msgstr "zerbitzari berria"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Konektatu kontaktuak"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Deskonektatu..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Bistaratuta dauden estekatutako kontaktuak erabat zatitu bereiztutako "
-"kontaktuetan."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Konektatu"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desestekatu estekatutako '%s' kontaktuak?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ziur zaude estekatutako kontaktu hauek desestekatzea nahi duzula? Honek "
-"erabat zatituko ditu estekatutako kontaktuak bereiztutako kontaktuetan."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Deskonektatu"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Erakutsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s(e)n berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s(r)ekin berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %Y/%B/%e %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "segundo %s"
 msgstr[1] "%s segundo"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "minutu %s"
 msgstr[1] "%s minutu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Deiaren iraupena: %s; amaiera: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Gaur"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Edozer ordu"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Edozein"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Nor"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Noiz"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Edozer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Testuzko berriketak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Sarrerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Irteerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Galdutako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Zer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ziur zaude aurreko berriketetako egunkari guztiak ezabatzea nahi dituzula?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Garbitu denak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Ezabatu hemendik:"
 
@@ -2527,7 +2477,7 @@ msgstr "Bideoa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -2539,36 +2489,82 @@ msgstr "_Fitxategia"
 msgid "page 2"
 msgstr "2. orrialdea"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontaktuaren IDa:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontaktua lineaz kanpo dago"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Zehaztutako kontaktua ez da baliozkoa edo ezezaguna da"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Berriketa"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontaktua ez dago onartuta berriketa mota honetan"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Eskatutako funtzionalitatea ez dago protokolo honentzako garatuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ezin izan da emandako kontaktuarekin berriketa hasi "
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Kanal honetan debekua ezarri dizute"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanal hau beteta dago"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Kanal honetara elkartzeko gonbidatua izan zara"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ezin da aurrera jarraitu deskonektatuta dagoen bitartean"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Baimena ukatuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Errorea gertatu da berriketa hastean"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Sartu kontaktuaren identifikatzailea edo telefono-zenbakia:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Solasaldi berria"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Bidali _bideoa"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Bideo-deia"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Deitu"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio-deia"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Dei berria"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> kontuaren autentifikazioak huts egin du"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2605,12 +2601,8 @@ msgstr "Egin klik egoera hau gogoko bihurtzeko"
 msgid "Set status"
 msgstr "Ezarri egoera"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Ezarri zure presentzia eta uneko egoera"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Mezu pertsonalizatuak..."
 
@@ -2618,7 +2610,7 @@ msgstr "Mezu pertsonalizatuak..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "%s kontu berria"
@@ -2687,12 +2679,12 @@ msgstr "Ahots-deia amaituta"
 msgid "Edit Custom Messages"
 msgstr "Editatu mezu pertsonalizatuak"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mezua noiz editatuta: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Arrunta"
 
@@ -2771,34 +2763,38 @@ msgid "Certificate hostname: %s"
 msgstr "Ziurtagiriaren ostalari-izena: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Jarraitu"
+msgid "C_ontinue"
+msgstr "_Jarraitu"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Konexio ez-fidagarria"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Konexio hau ez da fidagarria. Hala ere, jarraitzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Gogoratu aukera hau etorkizuneko konexioetan"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Ziurtagiriaren xehetasunak"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Ezin da URIa ireki"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ez dago nahikoa lekurik fitxategia gordetzeko"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2807,7 +2803,7 @@ msgstr ""
 "%s-tako leku librea behar da fitxategi hau gordetzeko, soilik %s dago ordea "
 "erabilgarri. Aukeratu beste kokaleku bat."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Sarrerako fitxategia %s(e)ndik"
@@ -2979,40 +2975,32 @@ msgstr "Mendebaldekoa"
 msgid "Vietnamese"
 msgstr "Vietnamera"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Hautatutako kontaktuak ezin du fitxategirik jaso"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Hautatutako kontaktua lineaz kanpo dago."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ez dago errorearen mezurik"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Berehalako mezularitza (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ez konektatu abiatzean"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy BM bezeroa"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Errorea kontu-kudeatzailearekin kontaktatzean"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3058,233 +3046,93 @@ msgstr ""
 "jasoko zenuen; hala ez bada, idatzi hona: Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Berehalako mezularitzako bezero bat GNOMErako"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Errore bat gertatu da kontuak inportatzean."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Errore bat gertatu da kontua sortzean."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Errore bat gertatu da."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Errorearen mezua: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
-"morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Errore bat gertatu da"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Zein motako berriketa-kontua duzu?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Sartu kontuaren xehetasunak"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Sartu kontu berriaren xehetasunak"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Google Talk, AIM, Windows Live eta beste berriketako programak darabilten "
-"inguruko jendearekin, lagunekin eta lankideekin berriketan egin dezakezu "
-"Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak egin "
-"ditzakezu."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ez, kontu berri bat nahi dut"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Hautatu inportatzea nahi dituzun kontuak:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Bai"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ez, hau izan da guztia"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
-"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
-"egiaztatu azpiko xehetasunak zuzenak direla. Xehetasun hauek beranduago "
-"erraz alda ditzakezu (edo eginbide hau desgaitu) 'Kontuak' elkarrizketa-"
-"koadroa erabiliz."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Editatu->Kontuak"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Oraingoz _ez dut eginbide hau gaitzerik nahi"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ezin izango duzu berriketan egin zure sare lokaleko beste erabiltzaileekin, "
-"telepathy-salut ez baitago instalatuta. Eginbide hau gaitzea nahi izanez "
-"gero, instalatu telepathy-salut paketea eta sortu 'Inguruko jendea' kontu "
-"bat 'Kontuak' elkarrizketa-koadroan."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ez dago instalatuta"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Mezularitzako eta VoIP-ko kontuaren laguntzailea"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Ongietorri Empathy-ra"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Inportatu dauzkazun kontuak"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Sartu xehetasun pertsonalak"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Gorde gabeko eraldaketak daude zure %s kontuan."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Zure kontu berria oraindik gorde gabe dago."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Konektatzen..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Lineaz kanpo — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Deskonektatuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Lineaz kanpo — Ez dago sareko konexiorik"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Egoera ezezaguna"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Kontu hau desgaitu egin da zaharkitutako eta onartu gabeko motorrean "
+"oinarritzen delako. Instalatu telepathy-haze eta berrabiarazi zure saioa "
+"kontua migratzeko."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Lineaz kanpo — Kontua desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
-"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Editatu konexioaren parametroak"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Huts egin du zure informazio pertsonala zerbitzaritik eskuratzean."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Jar zaitez linean zure informazio pertsonala editatzeko."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Editatu konexioaren parametroak..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3293,15 +3141,23 @@ msgstr ""
 "aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Gaituta"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Saltatu"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Konektatu"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3318,14 +3174,10 @@ msgid "Loading account information"
 msgstr "Kontaktuaren informazioa kargatzen"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ez da protokolorik instalatu"
+msgid "No protocol backends installed"
+msgstr "Ez da protokoloen motorrik instalatu"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoloa:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3333,132 +3185,116 @@ msgstr ""
 "Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
 "bakoitzaren motorra instalatu behar duzu."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Inportatu..."
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Inguruko jendea"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Distira"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Bolumena"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Albo-barra"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Bideo-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Dei-teklatua"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Xehetasunak"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Deitu honekin: %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Makinak IP helbidea ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP helbidea interneteko zerbitzari batek ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Parekoaren IP helbidea bestaldean ikusi da"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Transmisioko ('relay') zerbitzariaren IP helbidea"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Multidifusioko taldearen IP helbidea"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektatuta — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Xehetasun teknikoak"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3467,8 +3303,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen audio-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3477,8 +3313,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen bideo-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3487,29 +3323,29 @@ msgstr ""
 "Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
 "baimentzen ez dituen sare batean dago."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hutsegite bat egon da sarean"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3520,23 +3356,23 @@ msgstr ""
 "genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
 "menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hutsegite bat gertatu da deiaren motorrean"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Korrontearen amaierara iritsi da"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ezin da audioaren korrontea ezarri"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ezin da bideoaren korrontea ezarri"
 
@@ -3627,8 +3463,8 @@ msgstr "Txandakatu bideoaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -3646,17 +3482,17 @@ msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Edukia"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Araztu"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -3669,51 +3505,99 @@ msgid "_Settings"
 msgstr "_Ezarpenak"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Itxi leiho hau?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Leiho hau ixtean %s utziko da. Ez duzu mezu gehiago jasoko berriro elkartu "
+"arte."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Leiho hau ixtean berriketa-gela utziko da. Ez duzu mezu gehiago jasoko "
+"berriro elkartu arte."
+msgstr[1] ""
+"Leiho hau ixtean %u berriketa-gela utziko dira. Ez duzu mezu gehiago jasoko "
+"haietara berriro elkartu arte."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Utzi %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Ez duzu berriketa-gela honetatik mezu gehiago jasoko berriro elkartu arte."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Itxi leihoa"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Irten gelatik"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d irakurri gabe)"
 msgstr[1] "%s (%d irakurri gabe)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (eta beste %u)"
 msgstr[1] "%s (eta beste %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d irakurri gabe besteengandik)"
 msgstr[1] "%s (%d irakurri gabe besteengandik)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d irakurri gabe guztietatik)"
 msgstr[1] "%s (%d irakurri gabe guztietatik)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Mezu %d bidaltzen"
 msgstr[1] "%d mezu bidaltzen"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Mezua idazten."
 
@@ -3793,96 +3677,96 @@ msgstr "Konektatu automatikoki"
 msgid "Manage Favorite Rooms"
 msgstr "Kudeatu gogoko gelak"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Sarrerako bideo-deia"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Sarrerako deia"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Sarrerako deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Ez ona_rtu"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Erantzun"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Erantzun bideoarekin"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Sarrerako bideoko deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Gelarako gonbitea"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbitea"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Elkartu"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbidatua izan zara"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Pasahitza behar da"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s(e)k baimena eskatzen du zu linean noiz zauden ikusteko"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3892,105 +3776,105 @@ msgstr ""
 "Mezua: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s (%s/s)"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" hemendik jasotzen: %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" honi bidaltzen: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errorea \"%s\" hemendik jasotzean: %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Errorea fitxategi bat jasotzean"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errorea \"%s\" honi bidaltzean: %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Errorea fitxategi bat bidaltzean"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" hemendik jasota: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" honi bidalita: %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Fitxategi-transferentzia osatuta"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Beste partaideen erantzunaren zai"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\"(r)en osotasuna egiaztatzen"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"(r)en hash-a egiten"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fitxategia"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Falta:"
 
@@ -4004,7 +3888,11 @@ msgstr ""
 "Kendu osatutako, bertan behera utzitako eta huts egindako fitxategi-"
 "transferentziak zerrendatik"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Inportatu"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4012,171 +3900,195 @@ msgstr ""
 "Ez da inportatzeko konturik aurkitu. Empathy-k oraingoz Pidgin-etik soilik "
 "inporta ditzake kontuak."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Inportatu kontuak"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Inportatu"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Eman pasahitza"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Kontu bat konfiguratu behar duzu.kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ez da bat datorrenik aurkitu"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Ezin da %s kontua erabili %s softwarea eguneratu arte."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Eguneratu softwarea..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Itxi"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Berriz konektatu"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editatu kontua"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Itxi"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Berriro kargatu %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Berriro kargatu kontuaren kreditua"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Berriro kargatu..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Zure kontuetariko bat gaitu behar duzu kontaktuak hemen ikusteko."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "%s gaitu behar duzu kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontuaren ezarpenak"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontaktuak _mapa batean"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kredituaren balantzea"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Bilatu kontaktuen _zerrendan"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Elkartu _gogokoetan"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Kudeatu gogokoak"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Tamaina _normala"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Dei _berria..."
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Tamaina normala _avatarrekin"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Hobespenak"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Erakutsi p_rotokoloak"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordenatu _izenarekiko"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordenatu _egoerarekiko"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Kontuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokeatutako kontaktuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Tamaina _trinkoa"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Fitxategi-transferentziak"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Elkartu..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Solasaldi berria..."
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Konektatu gabeko kontaktuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Informazio pertsonala"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_Gela"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Bilatu kontaktuak..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Berriketa-gela"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Kideak"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4189,16 +4101,21 @@ msgstr ""
 "Pasahitza behar da: %s\n"
 "Kideak: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Bai"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ez"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ezin izan da gelen zerrenda abiarazi"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ezin izan da gelen zerrenda gelditu"
 
@@ -4233,79 +4150,79 @@ msgstr "Gelen zerrenda"
 msgid "_Room:"
 msgstr "_Gela:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mezua jasota"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mezua bidalita"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Solasaldi berria"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontaktua linean dago"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Kontaktua konektatu da "
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Kontua konektatuta"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Kontua deskonektatuta"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Hizkuntza"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, non zaude ez zaitudala ikusten Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Ukatu aita, ukatu izena ere;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Edo, ez baduzu nahi, zin egin maite nauzula"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Eta ez naiz gehiago Capuletar bat izango."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Gehiago entzun behar dut, edo erantzun dezaket?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta deskonektatu egin da"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -4365,35 +4282,27 @@ msgstr "Gaitu hizkuntzen zuzentzailea:"
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Sarrerako maila:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Sarrerako bolumena:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Kokalekuaren iturburuak:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Erregistratu solasaldiak"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Jo soinua gertaeretan"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Pribatutasuna"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4403,32 +4312,40 @@ msgstr ""
 "soilik argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
 "zehaztasuna edukiko du."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Erakutsi _aurpegierak irudi gisa"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Erakutsi kontaktu-_zerrenda geletan"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Soinuak"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Zuzentzailea"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Hasi berriketa hemen:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Gaiak"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Erabili _oihartzunaren ezeztapena deiaren kalitatea hobetzeko"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Aldaera:"
@@ -4458,18 +4375,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_Sarea (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Ireki berriketa berriak beste leihoetan"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Erakutsi kokalekua nire kontaktuei"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Murriztu kokalekuaren zehaztasuna"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "_leiho berriak"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_fitxa berriak"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Egoera"
@@ -4526,201 +4447,525 @@ msgstr "Piztu bideoa"
 msgid "Video Preview"
 msgstr "Bideoaren aurrebista"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktuen maparen ikuspegia"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Gorde"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin-en esteka"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin-en erantzuna"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datuak luzeegiak dira bat batean itsasteko. Gorde erregistroak fitxategian."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Arazketa-leihoa"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Bidali pastebin-era"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausatu"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Maila: "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Arazketa"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informazioa"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Abisua"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritikoa"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Errorea"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Ordua"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domeinua"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Maila"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Gonbidatu partaidea"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Aukeratu kontaktua solasaldira gonbidatzeko:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Gonbidatu"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
 "inportatzea) eta irten"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ez bistaratu inolako elkarrizketa-koadrorik \"Inguruko jendea\" kontuak "
 "soilik egon arte"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<kontuaren-IDa>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy kontuak"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy kontuak"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Erakutsi zerbitzu berezi bat"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy araztailea"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy araztailea"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy berriketarako bezeroa"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Baztertu"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Erantzun bideoarekin"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Onartu"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Eman"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s(e)k zuri deitzen saiatu da, baina beste dei batean zeunden."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Itxaron"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mututu"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Iraupena"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Zure uneko balantzea: %s"
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Ez daukazu nahikoa krediturik dei hori egiteko."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Berriro kargatu..."
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Maiuskula/minuskula"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Zein motako berriketa-kontua duzu?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Kontu berria gehitzea"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Inguruko jendea"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
+"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
+"egiaztatu azpiko xehetasunak zuzenak direla."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Xehetasun hauek beranduago alda ditzakezu edo funtzionalitate hau desgaitu "
+"kontaktuen zerrendan <span style=\"italic\">Editatu → Kontuak</span> "
+"aukeratuz."
+
+#~ msgid "Call volume"
+#~ msgstr "Deiaren bolumena"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Deiaren bolumena (ehunekotan)."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr ""
+#~ "Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten "
+#~ "du."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket mota ez dago onartuta"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Nire Web Kontuak"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s kontua '%s' bidez editatu da."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s kontua ezin da Empathy-n editatu."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Abiarazi 'Nire Web Kontuak'"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editatu %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Utzi"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informazio pertsonala"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Banatuta"
+
+#~ msgid "Favorite People"
+#~ msgstr "Gogoko jendea"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editatu"
+
+#~ msgid "Select a contact"
+#~ msgstr "Hautatu kontaktua"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Estekatutako kontaktuak"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Hautatu kontaktuak estekatzeko"
+
+#~ msgid "New contact preview"
+#~ msgstr "Kontaktu berriaren aurrebista"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Konektatu kontaktuak..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Konektatu kontaktuak"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Deskonektatu..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Bistaratuta dauden estekatutako kontaktuak erabat zatitu bereiztutako "
+#~ "kontaktuetan."
+
+#~ msgid "_Link"
+#~ msgstr "_Konektatu"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desestekatu estekatutako '%s' kontaktuak?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Ziur zaude estekatutako kontaktu hauek desestekatzea nahi duzula? Honek "
+#~ "erabat zatituko ditu estekatutako kontaktuak bereiztutako kontaktuetan."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Deskonektatu"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontaktuaren IDa:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Berriketa"
+
+#~ msgid "Send _Video"
+#~ msgstr "Bidali _bideoa"
+
+#~ msgid "C_all"
+#~ msgstr "_Deitu"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Ezarri zure presentzia eta uneko egoera"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Hautatutako kontaktuak ezin du fitxategirik jaso"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Hautatutako kontaktua lineaz kanpo dago."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Errore bat gertatu da kontuak inportatzean."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Errore bat gertatu da kontua sortzean."
+
+#~ msgid "There was an error."
+#~ msgstr "Errore bat gertatu da."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Errorearen mezua: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
+#~ "morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
+
+#~ msgid "An error occurred"
+#~ msgstr "Errore bat gertatu da"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Sartu kontuaren xehetasunak"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Sartu kontu berriaren xehetasunak"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Google Talk, AIM, Windows Live eta beste berriketako programak darabilten "
+#~ "inguruko jendearekin, lagunekin eta lankideekin berriketan egin dezakezu "
+#~ "Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak "
+#~ "egin ditzakezu."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ez, kontu berri bat nahi dut"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Hautatu inportatzea nahi dituzun kontuak:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ez, hau izan da guztia"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editatu->Kontuak"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Oraingoz _ez dut eginbide hau gaitzerik nahi"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ezin izango duzu berriketan egin zure sare lokaleko beste "
+#~ "erabiltzaileekin, telepathy-salut ez baitago instalatuta. Eginbide hau "
+#~ "gaitzea nahi izanez gero, instalatu telepathy-salut paketea eta sortu "
+#~ "'Inguruko jendea' kontu bat 'Kontuak' elkarrizketa-koadroan."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Mezularitzako eta VoIP-ko kontuaren laguntzailea"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Ongietorri Empathy-ra"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Inportatu dauzkazun kontuak"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Sartu xehetasun pertsonalak"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
+#~ "aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoloa:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Informazio pertsonala"
+
+#~ msgid "Input level:"
+#~ msgstr "Sarrerako maila:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Sarrerako bolumena:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Ireki berriketa berriak beste leihoetan"
+
 #~ msgid "All"
 #~ msgstr "Denak"
 
diff --git a/po/fi.po b/po/fi.po
index 45eb54680..718756f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,518 +9,516 @@
 # Timo Jyrinki https://launchpad.net/~timo-jyrinki
 # Tommi Saira https://launchpad.net/~tommisaira
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2010.
+# Gnome 2012-03 Finnish translation sprint participants:
+# Jiri Grönroos
+# Niklas Laxström
+# Timo Jyrinki
 msgid ""
 msgstr ""
+""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 13:41+0300\n"
-"PO-Revision-Date: 2011-09-08 13:41+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-03-12 08:36:45+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 2012-03-05 15:05:34+0000\n"
+"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-03-02\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Keskustele käyttäen Google Talkia, Facebookia, MSN:ää ja monia muita "
-"palveluja"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "pikaviestin"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy-pikaviestin"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "pikaviestin"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Keskustele käyttäen Google Talkia, Facebookia, MSN:ää ja monia muita palveluja"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Viestintä ja VoIP-käyttäjätilit"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
+msgid "Connection managers should be used"
+msgstr "Yhteyden hallintaohjelmia tulisi käyttää"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Puhelun äänenvoimakkuus"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen luomiseen ja katkaisuun."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Puhelun äänenvoimakkuus prosentteina."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kamera"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kameran sijainti"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathyn tulisi merkitä automaattisesti poissaolevaksi, mikäli konetta ei käytetä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Lempinimen jälkeen lisättävä merkki, kun käytetään lempinimen täydennystä "
-"(sarkain) ryhmäkeskustelussa."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli konetta ei käytetä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Keskusteluikkunan teema"
+msgid "Empathy default download folder"
+msgstr "Empathyn noutojen oletuskansio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Keskusteluikkunan teemamuunnos"
+msgid "The default folder to save file transfers in."
+msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman käyttämistä "
-"kielistä (esim. \"fi, en, fr\")."
+msgid "Show offline contacts"
+msgstr "Näytä linjoilta poissa olevat tuttavat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Pienikokoinen tuttavaluettelo"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Näytetäänkö poissa linjoilta olevat tuttavat tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Yhteyden hallintaohjelmia tulisi käyttää"
+msgid "Show avatars"
+msgstr "Näytä avatar-kuvat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Tuttavaluettelon lajitteluperuste"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Näytetäänkö tuttavien avatar-kuvakkeet tuttavaluettelossa ja keskusteluikkunoissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
+msgid "Show protocols"
+msgstr "Näytä protokollat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Älä näytä ponnahdusikkunoita poissaollessa"
+msgid "Show Balance in contact list"
+msgstr "Näytä saldo yhteystietoluettelossa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Älä soita ääniä poissaollessa"
+msgid "Whether to show account balances in the contact list."
+msgstr "Haluatko näyttää tilien saldot yhteystietoluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Näytä ajankohtaiset tapahtumat tilarivillä"
+msgid "Compact contact list"
+msgstr "Pienikokoinen tuttavaluettelo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Näytä ajankohtaiset tapahtumat tilarivillä. Mikäli epätosi, näytä ne "
-"käyttäjälle välittömästi."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Näytetäänkö tuttavaluettelo pienoiskokoa käytettäessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Kaiun poiston tuki"
+msgid "Hide main window"
+msgstr "Piilota pääikkuna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy voi julkaista käyttäjän sijainnin"
+msgid "Hide the main window."
+msgstr "Piilota pääikkuna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
+msgid "Default directory to select an avatar image from"
+msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
+msgid "Open new chats in separate windows"
+msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathyn noutojen oletuskansio"
+msgid "Always open a separate chat window for new chats."
+msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy on siirtänyt butterfly:n lokit"
+msgid "Display incoming events in the status area"
+msgstr "Näytä ajankohtaiset tapahtumat tilarivillä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathyn tulisi merkitä automaattisesti poissaolevaksi, mikäli konetta ei "
-"käytetä"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Näytä ajankohtaiset tapahtumat tilarivillä. Mikäli epätosi, näytä ne käyttäjälle välittömästi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
+msgid "The position for the chat window side pane"
+msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinä)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
+msgid "Show contact groups"
+msgstr "Näytä yhteyshenkilöryhmät"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Käytä WebKit-kehittäjän työkaluja"
+#, fuzzy
+msgid "Whether to show groups in the contact list."
+msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Näytä ponnahdusikkuna uusille viesteille"
+msgid "Contact list sort criterion"
+msgstr "Tuttavaluettelon lajitteluperuste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Käytä oikeinkirjoituksen tarkistusta"
+#, fuzzy
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo järjestetään tuttavien tilan perusteella."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Piilota pääikkuna"
+msgid "Use notification sounds"
+msgstr "Käytä merkkiääniä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Piilota pääikkuna."
+msgid "Whether to play a sound to notify of events."
+msgstr "Ilmoitetaanko tapahtumista merkkiäänin."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Lempinimen täydennysmerkki"
+msgid "Disable sounds when away"
+msgstr "Älä soita ääniä poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Avaa uusi ikkuna uusille keskusteluille"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Käytettävän Adium-teeman sijainti"
+msgid "Play a sound for incoming messages"
+msgstr "Soita merkkiääni saapuville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ilmoitetaanko saapuvista viesteistä merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Soita merkkiääni saapuville viesteille"
+msgid "Play a sound for outgoing messages"
+msgstr "Soita merkkiääni lähetettäville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Soita merkkiääni uusista keskusteluista"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ilmoitetaanko lähtevistä viesteistä merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "Soita merkkiääni lähetettäville viesteille"
+msgid "Play a sound for new conversations"
+msgstr "Soita merkkiääni uusista keskusteluista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ilmoitetaanko uusista keskusteluista merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
+msgid "Play a sound when a contact logs in"
+msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Soita merkkiääni kirjauduttaessa sisään"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Soita merkkiääni kirjauduttaessa ulos"
+msgid "Play a sound when a contact logs out"
+msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisään"
+msgid "Play a sound when we log in"
+msgstr "Soita merkkiääni kirjauduttaessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Play a sound when we log out"
+msgstr "Soita merkkiääni kirjauduttaessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr ""
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Näytä avatar-kuvat"
+msgid "Enable popup notifications for new messages"
+msgstr "Näytä ponnahdusikkuna uusille viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Näytä tuttavaluettelo huoneissa"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Näytetäänkö uudesta viestistä ponnahdusilmoitus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Näytä vihje pääikkunan sulkemisesta"
+msgid "Disable popup notifications when away"
+msgstr "Älä näytä ponnahdusikkunoita poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Näytä linjoilta poissa olevat tuttavat"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Näytetäänkö ponnahdusilmoituksia varattuna tai poissa oltaessa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Näytä protokollat"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Kielentarkastuksessa käytetyt kielet"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Näytetäänkö avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta viestistä ponnahdusilmoitus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Näytetäänkö ponnahdusilmoitus tuttavan sisäänkirjautumisesta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Keskusteluikkunan sivupaneelin sijainti"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinä)."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Näytetäänkö ponnahdusilmoitus tuttavan uloskirjautumisesta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Keskusteluikkunoissa käytettävä teema."
+msgid "Use graphical smileys"
+msgstr "Käytä hymiökuvakkeita"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"Teemamuunnos jota käytetään näyttämään keskustelu keskusteluikkunoissa."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Käytä hymiökuvakkeita"
+msgid "Show contact list in rooms"
+msgstr "Näytä tuttavaluettelo huoneissa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Käytä merkkiääniä"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Käytä teemaa keskusteluhuoneille"
+msgid "Chat window theme"
+msgstr "Keskusteluikkunan teema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Saako Empathy paljastaa käyttäjän sijainnin tuttaville."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Keskusteluikkunoissa käytettävä teema."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Saako Empathy käyttää GPS:ää sijainnin arvaamiseen."
+msgid "Chat window theme variant"
+msgstr "Keskusteluikkunan teemamuunnos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Saako Empathy käyttää matkapuhelinverkkoa sijainnin arvaamiseen."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Teemamuunnos jota käytetään näyttämään keskustelu keskusteluikkunoissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
+msgid "Path of the Adium theme to use"
+msgstr "Käytettävän Adium-teeman sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Onko Empathy siirtänyt butterfly-lokit."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
+msgid "Enable WebKit Developer Tools"
+msgstr "Käytä WebKit-kehittäjän työkaluja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli "
-"konetta ei käytetä."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
+msgid "Inform other users when you are typing to them"
+msgstr "Salli muiden käyttäjien nähdä, että kirjoitat viestiä heille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
 msgstr ""
-"Käyttääkö Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön."
+msgid "Use theme for chat rooms"
+msgstr "Käytä teemaa keskusteluhuoneille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
-"luomiseen ja katkaisuun."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Käytetäänkö teemaa keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellä."
+msgid "Spell checking languages"
+msgstr "Kielentarkastuksessa käytetyt kielet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman käyttämistä kielistä (esim. \"fi, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Enable spell checker"
+msgstr "Käytä oikeinkirjoituksen tarkistusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiäänellä."
+msgid "Nick completed character"
+msgstr "Lempinimen täydennysmerkki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Ilmoitetaanko tapahtumista merkkiäänin."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Lempinimen jälkeen lisättävä merkki, kun käytetään lempinimen täydennystä (sarkain) ryhmäkeskustelussa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ilmoitetaanko saapuvista viesteistä merkkiäänellä."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ilmoitetaanko uusista keskusteluista merkkiäänellä."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Käyttääkö Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ilmoitetaanko lähtevistä viesteistä merkkiäänellä."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiäänellä."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
+msgid "Camera device"
+msgstr "Kamera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Näytetäänkö ponnahdusilmoitus tuttavan uloskirjautumisesta."
+msgid "Camera position"
+msgstr "Kameran sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Näytetäänkö ponnahdusilmoitus tuttavan sisäänkirjautumisesta."
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Näytetäänkö avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
-"viestistä ponnahdusilmoitus."
+msgid "Echo cancellation support"
+msgstr "Kaiun poiston tuki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Näytetäänkö uudesta viestistä ponnahdusilmoitus."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Käytetäänkö Pulseaudion suodatinta kaiun poistamiseksi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
+msgid "Show hint about closing the main window"
+msgstr "Näytä vihje pääikkunan sulkemisesta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Näytetäänkö tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
-"keskusteluikkunoissa."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Pyydetäänkö pääikkunan sulkemisesta vahvistusta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Näytetäänkö poissa linjoilta olevat tuttavat tuttavaluettelossa."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy voi julkaista käyttäjän sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Näytetäänkö ponnahdusilmoituksia varattuna tai poissa oltaessa."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Saako Empathy paljastaa käyttäjän sijainnin tuttaville."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Näytetäänkö tuttavaluettelo pienoiskokoa käytettäessä."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "Pyydetäänkö pääikkunan sulkemisesta vahvistusta."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Saako Empathy käyttää matkapuhelinverkkoa sijainnin arvaamiseen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Käytetäänkö teemaa keskusteluhuoneissa."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" "
-"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
-"järjestetään tuttavien tilan perusteella."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Saako Empathy käyttää GPS:ää sijainnin arvaamiseen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Viestintä ja VoIP-käyttäjätilit"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Syytä ei annettu"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Pyydettiin tilan muutosta"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Keskeytit tiedostonsiirron"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Virhe yritettäessä siirtää tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Tuntematon syy"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Etäyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjä"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Vastaamaton puhelu käyttäjältä %s"
@@ -536,452 +534,394 @@ msgstr "Soitettiin käytäjälle %s"
 msgid "Call from %s"
 msgstr "Puhelu käyttäjältä %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Pistoketyyppi ei ole tuettu"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Syytä ei annettu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Pyydettiin tilan muutosta"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Keskeytit tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Virhe yritettäessä siirtää tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Tuntematon syy"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Erittelemätön syy"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Tila on nyt �Poissa linjoilta�"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nimi on käytössä"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielä aktivoitu"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei täsmää"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjälki ei täsmää"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Salausta ei ole käytettävissä"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Yhteys hylättiin"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Yhteyttä ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Tämä resurssi on jo yhdistetty palvelimelle"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Tämä tili on jo yhteydessä palvelimeen"
 
-#: ../libempathy/empathy-utils.c:346
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:357
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Yhteys on korvattu samaa resurssia käyttävällä uudella yhteydellä"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Palvelin on liian kiireinen käsitelläkseen tätä yhteyttä"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:355
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne käyttää heikkoa salausmenetelmää"
 
-#: ../libempathy/empathy-utils.c:358
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
-"suurempia kuin salauskirjasto sallii"
+#: ../libempathy/empathy-utils.c:369
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Sovelluksesi on liian vanha"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Sisäinen virhe"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Lähellä olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Omat WWW-tilit"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Käyttäjätiliä %s ei voi muokata Empathyssä."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Käynnistä Web-tilit"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Muokkaa %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Käyttäjänimi:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Kirjaudu sisään"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Tämä tili on jo olemassa palvelimella"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Peru"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s palvelimella %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Uusi tili"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Esimerkki:</b> Nimimerkkini"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "S_alasana:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Lisäasetukset"
+msgid "Screen _Name:"
+msgstr "Näyttö_nimi:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Esimerkki:</b> Nimimerkkini"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "S_alasana:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Muista salasana"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Portti:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Muista salasana"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Näyttö_nimi:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "Pal_velin:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Mikä on AIM-salasanasi?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Lisäasetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Mikä on AIM-näyttönimesi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Portti:"
+msgid "What is your AIM password?"
+msgstr "Mikä on AIM-salasanasi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "Pal_velin:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Esimerkki:</b> käyttäjänimi"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Esimerkki:</b> käyttäjänimi"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Mikä on GroupWise-käyttäjätunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Mikä on GroupWise-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Esimerkki:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Merkkikartta:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Mikä on ICQ UIN -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Mikä on ICQ-salasanasi?"
 
@@ -1018,25 +958,25 @@ msgstr "Valinnat"
 msgid "None"
 msgstr "Ei mitään"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Verkko"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Merkkikartta:"
+msgid "Network:"
+msgstr "Verkko:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Useimmat IRC-palvelimet eivät tarvitse salasanaa, joten jos et ole varma, "
-"älä syötä salasanaa."
+msgid "Character set:"
+msgstr "Merkkikartta:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Verkko"
+msgid "Servers"
+msgstr "Palvelimet"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Verkko:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Useimmat IRC-palvelimet eivät tarvitse salasanaa, joten jos et ole varma, älä syötä salasanaa."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1054,265 +994,250 @@ msgstr "Lopetusviesti:"
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Palvelimet"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Mikä on IRC-nimimerkkisi?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Mikä IRC-verkko?"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Mikä on IRC-nimimerkkisi?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Mikä on Facebook-käyttäjänimesi?"
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "This is your username, not your normal Facebook login.\nIf you are facebook.com/<b>badger</b>, enter <b>badger</b>.\nUse <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+msgstr "Kyseessä on käyttäjänimi, ei normaalisti Facebook-kirjautumiseen käytettävä sähköpostiosoite.\nJos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita <b>tunnus</b>.\nJos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href=\"http://www.facebook.com/username/\">tällä sivulla</a>."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "Mikä on Facebook-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "Mikä on Google-tunnuksesi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
 msgstr "<b>Esimerkki:</b> nimi@gmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "Mikä on Google-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>Esimerkki:</b> nimi@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Salaus vaa_ditaan (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
 msgstr "_Älä huomioi SSL-varmenteiden virheitä"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Ohita palvelimen asetukset"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
 msgstr "_Prioriteetti:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
-#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"Kyseessä on käyttäjänimi, ei normaalisti Facebook-kirjautumiseen käytettävä "
-"sähköpostiosoite.\n"
-"Jos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
-"<b>tunnus</b>.\n"
-"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href="
-"\"http://www.facebook.com/username/\">tällä sivulla</a>."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Käytä vanhaa SS_L-porttia"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Facebook password?"
-msgstr "Mikä on Facebook-salasanasi?"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Salaus vaa_ditaan (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Mikä on Facebook-käyttäjänimesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
-msgstr "Mikä on Google-tunnuksesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Google password?"
-msgstr "Mikä on Google-salasanasi?"
+msgid "Use old SS_L"
+msgstr "Käytä vanhaa SS_L-porttia"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Ohita palvelimen asetukset"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Mikä on Jabber-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Mikä on Jabber-salasanasi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Mikä on haluamasi Jabber-tunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Mikä on Jabber-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Mikä on haluamasi Jabber-salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Esimerkki:</b> tunnus@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Mikä on Windows Live -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Mikä on Windows Live -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Sähköposti_osoite:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Ni_mimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Sukunimi:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Etunimi:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Julkaistu nimi:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-tunniste:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sukunimi:"
+msgid "E-_mail address:"
+msgstr "Sähköposti_osoite:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Julkaistu nimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Käyttäjänimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Esimerkki:</b> käyttäjä@sip-palvelimen.osoite"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Tunnistautumisen käyttäjänimi:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Löydä Sidonta"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Havaitse STUN-palvelin automaattisesti"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Sivuuta TLS-virheet"
+msgid "NAT Traversal Options"
+msgstr "NAT-läpäisyn (NAT-T) asetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Aikaväli (sekunneissa)"
+msgid "Proxy Options"
+msgstr "Välipalvelinvalinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Käynnissä pitävät valinnat"
+msgid "Miscellaneous Options"
+msgstr "Muut valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Löyhä reititys"
+msgid "STUN Server:"
+msgstr "STUN-palvelin:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismi:"
+msgid "Discover the STUN server automatically"
+msgstr "Havaitse STUN-palvelin automaattisesti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Muut valinnat"
+msgid "Discover Binding"
+msgstr "Löydä Sidonta"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT-läpäisyn (NAT-T) asetukset"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Käynnissä pitävät valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Portti:"
+msgid "Mechanism:"
+msgstr "Mekanismi:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Välipalvelinvalinnat"
+msgid "Interval (seconds)"
+msgstr "Aikaväli (sekunneissa)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Tunnistautumisen käyttäjänimi:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Siirto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-palvelin:"
+msgid "Loose Routing"
+msgstr "Löyhä reititys"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Palvelin:"
+msgid "Ignore TLS Errors"
+msgstr "Sivuuta TLS-virheet"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Siirto:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "Portti:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Mikä on SIP-tilisi salasana?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mikä on SIP-tilisi käyttäjätunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Käyttäjänimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Mikä on SIP-tilisi salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-_tunnus:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Älä huomioi konferenssi- ja keskusteluhuonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Huoneluettelon maa-asetusto:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Mikä on Yahoo! -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Mikä on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-_tunnus:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Huoneluettelon maa-asetusto:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Järjestelmässäsi ei ole tukea yhdellekään hyväksytylle kuvatiedostomuodolle"
+msgstr "Järjestelmässäsi ei ole tukea yhdellekään hyväksytylle kuvatiedostomuodolle"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ota kuva..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
@@ -1320,242 +1245,245 @@ msgstr "Kaikki tiedostot"
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Puhelun aloittamisessa tapahtui virhe"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Valittu yhteystieto ei tue puheluja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Valittu yhteystieto on poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Valittu yhteystieto on virheellinen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Tämä protokolla ei tue hätäpuheluita"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Aihe ei ole tuettu tässä keskustelussa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois näkyvistä"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
+#: ../libempathy-gtk/empathy-chat.c:1099
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeä nykyisellä palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <viesti>: lähetä TOIMINTO viesti tämänhetkiseen keskusteluun"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <viesti>: lähettää <viestin> sisällön kokonaisuudessaan keskusteluun. "
-"Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", "
-"esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
+#: ../libempathy-gtk/empathy-chat.c:1115
+msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
+msgstr "/say <viesti>: lähettää <viestin> sisällön kokonaisuudessaan keskusteluun. Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on "
-"määritetty, näytä sen ohje."
+#: ../libempathy-gtk/empathy-chat.c:1123
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on määritetty, näytä sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Käyttö: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Tuntematon komento; kirjoita /help nähdäksesi käytössä olevat komennot"
 
+#: ../libempathy-gtk/empathy-chat.c:1564
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Virhe viestiä lähettäessä: %s"
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "lupa evätty"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "liian pitkä viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1447
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Virhe viestiä lähettäessä: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s asetti aiheeksi: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lisää �%s� sanakirjaan"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lisää �%s� kielen %s sanakirjaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s katkaisi"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s potkaistiin"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1564,105 +1492,108 @@ msgstr "%s on poistunut huoneesta"
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
-#.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Haluaisitteko tallentaa tämän salasanan?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Muista"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ei nyt"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Väärä salasana, yritä uudelleen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Keskustelu"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Tuntematon tai virheellinen tunniste"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Yhteyshenkilöiden esto tilapäisesti poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Yhteyshenkilöiden esto poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pääsy evätty"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Yhteystietoa ei voitu estää"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Muokkaa estettyjä yhteystietoja"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1672,578 +1603,548 @@ msgstr "Estetyt yhteyshenkilöt"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Poista"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Muokkaa tuttavan tietoja"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Henkilökohtaiset tiedot"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Oletko varma käyttäjän '%s' estämisestä?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Raportoi tämä yhteyshenkilö loukkaavana"
 msgstr[1] "_Raportoi nämä yhteyshenkilöt loukkaavina"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Päätä myöhemmin"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Liittymispyyntö"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "Es_tä käyttäjä"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ryhmittelemättömät"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Suosikkihenkilöt"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Poistetaan ryhmää"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Poistetaan tuttava"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Lisää tuttava…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Es_tä yhteystieto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Keskustele"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Äänipuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videopuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Aiemmat keskustelut"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Jaa työpöytäni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
-msgid "Favorite"
-msgstr "Suosikki"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Tietoja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Kutsu keskusteluhuoneeseen"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Päätä myöhemmin"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Etsi yhteystietoja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Etsi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Lisää yhteystieto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Valitse tuttava"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Koko nimi:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Puhelinnumero:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Sähköpostiosoite:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Kotisivu:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Syntymäpäivä:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viimeksi nähty:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Yhdisti kohteesta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poissaoloviesti:"
+msgstr "Salli minun nähdä, milloin olet verkossa. Kiitos!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanavat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Kiipeämisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Viimeksi päivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %Bta %Y klo %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Sijainti</b> hetkellä (pvm)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nimimerkki:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Asiakastiedot"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Asiakasohjelma:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Henkilökohtaiset tiedot:"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Tuttavan tiedot"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Koko nimi"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Puhelinnumero"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Sähköpostiosoite"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "WWW-sivusto"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Syntymäpäivä"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Viimeksi nähty:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Yhdisti kohteesta:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Poissaoloviesti:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "työ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "koti"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "matkapuhelin"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "ääni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "ensisijainen"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postiosoite"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "Ulkoasu"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Tunniste:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nimimerkki:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)	"
+msgstr "<b>Sijainti</b> hetkellä (pvm)	"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Pyydetään tietoja…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Asiakastiedot"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "Käyttöjärjestelmä:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Asiakasohjelma:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit "
-"valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
+msgstr "Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Lisää ryhmä"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Valitse"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#, invalid-plural
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#, invalid-plural
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linkitetyt yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Valitse linkitettävät yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Uuden yhteystiedon esikatselu"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetään yhteen."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Muokkaa tuttavan tietoja"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Valitse soittoon käytettävä tili"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Soita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Työ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Koti"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "Es_tä yhteystieto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Keskustele"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Aiemmat keskustelut"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Jaa työpöytäni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Suosikki"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Pakettia gnome-contacts ei ole asennettu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Tietoja"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Linkitä yhteystiedot…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Kutsu keskusteluhuoneeseen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Lisää tuttava…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Poista ja _estä"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Poistetaan ryhmää"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Poistetaan tuttava"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format, invalid-plural
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
 msgstr[0] ""
@@ -2253,23 +2154,23 @@ msgstr[1] ""
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Sijainti</b> hetkellä (pvm)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
-msgstr ""
+msgstr "Linjoilla puhelimesta tai mobiililaitteesta"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Valitse IRC-verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Valitse"
@@ -2282,247 +2183,259 @@ msgstr "uusi palvelin"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Linkitä yhteystiedot"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Poista linkitys…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Linkitä"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Poista linkitys"
-
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:688
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Näytä"
 
-#: ../libempathy-gtk/empathy-log-window.c:710
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1158
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1160
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Keskustele käyttäjän %s kanssa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1210
-#: ../libempathy-gtk/empathy-log-window.c:1357
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr ""
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1299
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1305
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunti"
+msgstr[1] "%s sekuntia"
+
 #: ../libempathy-gtk/empathy-log-window.c:1378
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuutti"
+msgstr[1] "%s minuuttia"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Puhelun kesto %s, puhelu päättyi %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Tänään"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../libempathy-gtk/empathy-log-window.c:1737
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+#, fuzzy
 msgid "%e %B %Y"
-msgstr ""
+msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1818
-#: ../libempathy-gtk/empathy-log-window.c:3399
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
-msgstr ""
+msgstr "Milloin tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1898
-#: ../libempathy-gtk/empathy-log-window.c:2328
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
-msgstr ""
+msgstr "Kuka tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2640
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kuka"
 
-#: ../libempathy-gtk/empathy-log-window.c:2844
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Milloin"
 
-#: ../libempathy-gtk/empathy-log-window.c:2960
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
-msgstr ""
+msgstr "Mitä tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2962
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
-msgstr ""
+msgstr "Tekstikeskustelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2964
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2969
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Saapuneet puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2970
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Soitetut puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2971
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Vastaamattomat puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Mitä"
 
-#: ../libempathy-gtk/empathy-log-window.c:3702
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
+msgstr "Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3706
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Tyhjennä kaikki"
 
-#: ../libempathy-gtk/empathy-log-window.c:3713
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
-msgstr ""
+msgstr "Poista kohteesta:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ladataan...</span>"
+msgid "_File"
+msgstr "_Tiedosto"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Keskustelu"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Muokkaa"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Poista kaikki historia..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Keskustelu"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "sivu 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Tuttavan tunniste:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ladataan...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Yhteystieto ei ole linjoilla"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Keskustele"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Valittu yhteystieto on joko virheellinen tai tuntematon"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#, fuzzy
+msgid "The contact does not support this kind of conversation"
+msgstr "Aihe ei ole tuettu tässä keskustelussa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Sinulla on porttikielto tälle kanavalle"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanava on täynnä"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Kanavalle voi liittyä vain kutsusta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "Yhteys tuttavaan katkaistu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#, fuzzy
+msgid "Permission denied"
+msgstr "lupa evätty"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#, fuzzy
+msgid "There was an error starting the conversation"
+msgstr "Puhelun aloittamisessa tapahtui virhe"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Lähetä _videota"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Videopuhelu"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Soita"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Uusi puhelu"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format, fuzzy
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Todennus epäonnistui"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"Anna salasana tilille\n"
-"<b>%s</b>"
+msgid "Enter your password for account\n<b>%s</b>"
+msgstr "Anna salasana tilille\n<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2552,20 +2465,15 @@ msgstr "Napsauta tehdäksesi tästä tilasta suosikin"
 msgid "Set status"
 msgstr "Aseta tila"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Aseta läsnäolosi ja nykyinen tilasi"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Omat viestit…"
 
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Uusi %s-tili"
@@ -2575,20 +2483,20 @@ msgid "Find:"
 msgstr "Etsi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr ""
+msgid "_Previous"
+msgstr "_Edellinen"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Lausetta ei löydy"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Seuraava"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Huomioi kirjainkoko"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr ""
+msgid "Phrase not found"
+msgstr "Lausetta ei löydy"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2634,14 +2542,14 @@ msgstr "Puhelu päättyi"
 msgid "Edit Custom Messages"
 msgstr "Muokkaa itse määriteltyjä viestejä"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
-msgstr ""
+msgstr "Viestiä muokattu %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr ""
+msgstr "Tavallinen"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2677,7 +2585,7 @@ msgstr "Varmennetta ei ole vielä aktivoitu."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
-msgstr ""
+msgstr "Varmenteella ei ole odotettua sormenjälkeä."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
@@ -2688,13 +2596,12 @@ msgid "The certificate is self-signed."
 msgstr "Varmenne on allekirjoitettu itse."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
-msgstr ""
+msgstr "Varmenne on kryptografisesti heikko."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
 msgid "The certificate length exceeds verifiable limits."
@@ -2702,7 +2609,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
 msgid "The certificate is malformed."
-msgstr ""
+msgstr "Varmenne on muodostettu väärin."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2715,43 +2622,43 @@ msgid "Certificate hostname: %s"
 msgstr "Varmenteen ilmoittama isäntänimi: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Jatka"
+msgid "C_ontinue"
+msgstr "J_atka"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Muista tämä valinta tulevia yhteyksiä varten"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Tiedoston tallennukseen ei ole riittävästi tilaa"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"Tiedoston tallennukseen vaaditaan tilaa vähintään %s, mutta vain %s on "
-"saatavilla. Valitse toinen tallennussijainti."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Tiedoston tallennukseen vaaditaan tilaa vähintään %s, mutta vain %s on saatavilla. Valitse toinen tallennussijainti."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto käyttäjältä %s"
@@ -2923,830 +2830,602 @@ msgstr "länsimaalainen"
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Valittu tuttava ei voi vastaanottaa tiedostoja."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Valittu tuttava on poissa linjoilta."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ei virheilmoitusta"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Älä yhdistä käynnistettäessä"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Älä näytä tuttavalistaa tai muita dialogeja käynnistyksessä"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Virhe yhdistettäessä tilienhallintaan"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n"
-"\n"
-"%s"
+msgid "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n\n%s"
+msgstr "Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n\n%s"
 
 #: ../src/empathy-about-dialog.c:81
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy on vapaa ohjelma; sitä on sallittu levittää edelleen ja muuttaa GNU "
-"yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free "
-"Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
-"(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy on vapaa ohjelma; sitä on sallittu levittää edelleen ja muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free Software Foundation on ne julkaissut; joko lisenssin version 2, tai (valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
 
 #: ../src/empathy-about-dialog.c:85
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathyä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman "
-"mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä "
-"laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä "
-"lisää yksityiskohtia."
+msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "Empathyä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä lisää yksityiskohtia."
 
 #: ../src/empathy-about-dialog.c:89
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Empathyn mukana pitäisi tulla kopio GPL-lisenssistä; jos näin ei ole, "
-"kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Empathyn mukana pitäisi tulla kopio GPL-lisenssistä; jos näin ei ole, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr ""
-"Samuli Seppänen ja Henna Nykänen, 2006.\n"
-"Ilkka Tuohela, 2006-2009.\n"
-"Tommi Vainikainen, 2009.\n"
-"Ville-Pekka Vainio, 2010.\n"
-"\n"
-"http://www.gnome.fi/\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Antti Kajander https://launchpad.net/~antti-kajander\n"
-"  Christian Hellberg https://launchpad.net/~christian-hellberg\n"
-"  Elias Julkunen https://launchpad.net/~eliasj\n"
-"  Heikki Kulhia https://launchpad.net/~hessuk\n"
-"  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n"
-"  Ilari Oras https://launchpad.net/~ilarioras\n"
-"  Ilkka Tuohela https://launchpad.net/~hile\n"
-"  Ilkka Tuohela https://launchpad.net/~hile-utu\n"
-"  Jammi Vesterinen https://launchpad.net/~jmov\n"
-"  Jani Uusitalo https://launchpad.net/~uusijani\n"
-"  Jere Sokka https://launchpad.net/~jerry-sokka\n"
-"  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
-"  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n"
-"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n"
-"  Kristian Kurki https://launchpad.net/~kristian-kurki\n"
-"  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n"
-"  Mika Suomalainen https://launchpad.net/~mkaysi\n"
-"  Mikko Nissinen https://launchpad.net/~mikko\n"
-"  Miko-Matias Grönvall https://launchpad.net/~matias-gronvall\n"
-"  Ncl8 https://launchpad.net/~crofle\n"
-"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
-"  Tomi Juntunen https://launchpad.net/~tojuntu\n"
-"  Tommi Saira https://launchpad.net/~tommisaira\n"
-"  Tommi Vainikainen https://launchpad.net/~thv\n"
-"  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n"
-"  papukaija https://launchpad.net/~papukaija"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Tilien tuonnin aikana tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Virhe jäsennettäessä käyttäjätilien asetuksia."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Tiliä luodessa tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Virheilmoitus: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Voit joko mennä takaisin ja syöttää tilien tiedot uudestaan, tai lopettaa "
-"tämän apulaisen ja lisätä tilit myöhemmin Muokkaa-valikosta."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Tapahtui virhe"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Onko sinulla muita tilejä, jotka haluaisit määritellä?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Syötä tilisi tiedot"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Minkä tyyppisen pikaviestintilin haluat luoda?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Haluatko luoda muita pikaviestintilejä?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Syötä uuden käyttäjätilin tiedot"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Keskustele Empathyn avulla verkossa olevien tuttujen kanssa, joilla on "
-"esimerkiksi Google Talk, AIM, Windows Live tai muu pikaviestintili käytössä. "
-"Mikrofonin ja web-kameran avulla voit myös soittaa ääni- tai videopuheluita."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Onko sinulla käyttäjätili, jota olet käyttänyt toisessa pikaviestimessä?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Kyllä, tuo tilitiedot ohjelmasta "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Kyllä, syötän tilitietoni nyt"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ei, haluan uuden käyttäjätilin"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ei, haluan vain nähdä samassa lähiverkossa linjoilla olevat henkilöt"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Valitse tilit, jotka haluat tuoda:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Kyllä"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ei, tässä oli kaikki"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon "
-"yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista "
-"että alla olevat yksityiskohdat pitävät paikkansa. Voit helposti muuttaa "
-"näitä yksityiskohtia myöhemmin tai estää tämän toiminnon käyttämällä �Tilit�-"
-"valintaikkunaa."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Muokkaa->Tilit"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "En _halua käyttää tätä ominaisuutta juuri nyt"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillä "
-"telepathy-salut ei ole asennettu. Jos haluat ottaa tämän ominaisuuden "
-"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili Tilit-"
-"ikkunassa."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "pakettia telepathy-salut ei ole asennettu"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Viestintä- ja VoIP-käyttäjätilien apulainen"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Tervetuloa Empathyyn"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Tuo olemassa olevat käyttäjätilit"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Syötä henkilökohtaiset tiedot"
+msgstr "Samuli Seppänen ja Henna Nykänen, 2006.\nIlkka Tuohela, 2006-2009.\nTommi Vainikainen, 2009.\nVille-Pekka Vainio, 2010.\n\nhttp://www.gnome.fi/\n\nLaunchpad Contributions:\n  Antti Kajander https://launchpad.net/~antti-kajander\n  Christian Hellberg https://launchpad.net/~christian-hellberg\n  Elias Julkunen https://launchpad.net/~eliasj\n  Heikki Kulhia https://launchpad.net/~hessuk\n  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n  Ilari Oras https://launchpad.net/~ilarioras\n  Ilkka Tuohela https://launchpad.net/~hile\n  Ilkka Tuohela https://launchpad.net/~hile-utu\n  Jammi Vesterinen https://launchpad.net/~jmov\n  Jani Uusitalo https://launchpad.net/~uusijani\n  Jere Sokka https://launchpad.net/~jerry-sokka\n  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n  Kristian Kurki https://launchpad.net/~kristian-kurki\n  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n  Mika Suomalainen https://launchpad.net/~mkaysi\n  Mikko Nissinen https://launchpad.net/~mikko\n  Miko-Matias Grönvall https://launchpad.net/~matias-gronvall\n  Ncl8 https://launchpad.net/~crofle\n  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n  Tomi Juntunen https://launchpad.net/~tojuntu\n  Tommi Saira https://launchpad.net/~tommisaira\n  Tommi Vainikainen https://launchpad.net/~thv\n  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n  papukaija https://launchpad.net/~papukaija"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Tilille %s tehtyjä muutoksia ei ole tallennettu."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Uutta tiliäsi ei ole vielä tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Yhdistetään…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Poissa linjoilta — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Yhteys katkaistu — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Poissa linjoilta — Ei verkkoyhteyttä"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Poissa linjoilta — Tili ei ole käytettävissä"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Muokkaa yhteyden asetuksia"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Henkilökohtaisten tietojesi nouto palvelimelta epäonnistui."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"Olet luomassa uutta käyttäjätiliä. Uuden tilin luonti hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Muokkaa yhteyden asetuksia..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin �%s� tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Tämä ei poista tiliäsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1432
-msgid ""
-"You are about to select another account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:1562
+msgid "You are about to select another account, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
-msgstr ""
+msgstr "Ota _käyttöön"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
-msgstr ""
+msgstr "Ota _pois käytöstä"
 
-#: ../src/empathy-accounts-dialog.c:2154
-msgid ""
-"You are about to close the window, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "O_hita"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Yhdistä"
+
+#: ../src/empathy-accounts-dialog.c:2303
+msgid "You are about to close the window, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkää\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Add…"
 msgstr "Lisää..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Ladataan tilin tietoja"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Protokollaa ei ole asennettu"
+msgid "_Import…"
+msgstr "_Tuo…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Yhteyskäytäntö:"
+msgid "Loading account information"
+msgstr "Ladataan tilin tietoja"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle "
-"protokollalle tarvittava taustajärjestelmä."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle protokollalle tarvittava taustajärjestelmä."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Tuo…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Yhteyskäytäntötaustaosia ei asennettu"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Lähellä olevat ihmiset"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Äänisyöte"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videosyöte"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Tiedot"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Tämän koneen näkemä IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internetissä olevan palvelimen näkemä IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Vertaisen IP-osoite toiselta puolen nähtynä"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Välityspalvelimen IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Ryhmälähetysryhmän IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään äänimuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään videomuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, "
-"joka ei salli suoria yhteyksiä."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, joka ei salli suoria yhteyksiä."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Verkkoyhteydessä tapahtui virhe"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle tietokoneelle"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle tietokoneelle"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a "
-"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-"
-"ikkunasta kerätyt lokit \"Apua\"-valikosta."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-ikkunasta kerätyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ääniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Ääni"
+msgid "_Call"
+msgstr "_Soita"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Purkamiskoodekki:"
+msgid "_Microphone"
+msgstr "_Mikrofoni"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr ""
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "A_setukset"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Pakkauskoodekki:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Näytä"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Katkaise"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "O_hje"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Lopeta nykyinen puhelu"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Sisältö"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Paikallisehdokas:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Vianetsintä"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "Vaihda kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Etäehdokas:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Lähetä ääntä"
+msgid "Disable camera"
+msgstr "Ota kamera pois käytöstä"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Lähetä video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Lopeta nykyinen puhelu"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videopuhelu"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Aloita videopuhelu"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Aloita äänipuhelu"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Vaihda kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Äänen lähetys päälle/pois"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr ""
+msgid "Show dialpad"
+msgstr "Näytä numeronäppäimet"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
-msgid "Unknown"
-msgstr "Tuntematon"
+msgid "Display the dialpad"
+msgstr "Näytä numeronäppäimistö"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Lähetä video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videopuhelu"
+msgid "Toggle video transmission"
+msgstr "Kytke videon lähetys päälle tai pois"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Soita"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Lähetä ääntä"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sisältö"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Äänen lähetys päälle/pois"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Vianetsintä"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Pakkauskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "O_hje"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Purkamiskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Etäehdokas:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Paikallisehdokas:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Näytä"
+msgid "Audio"
+msgstr "Ääni"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Suljetaanko tämä ikkuna?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:305
+#, c-format, invalid-plural
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Poistutaanko huoneesta %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Sulje ikkuna"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Poistu huoneesta"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d lukematon)"
 msgstr[1] "%s (%d lukematonta)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ja %u muu)"
 msgstr[1] "%s (ja %u muuta)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d lukematon muilta)"
 msgstr[1] "%s (%d lukematonta muilta)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d lukematon kaikilta)"
 msgstr[1] "%s (%d lukematonta kaikilta)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lähetetään %d viesti"
+msgstr[1] "Lähetetään %d viestiä"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiä."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Tyhjennä"
+msgid "_Conversation"
+msgstr "_Keskustelu"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "T_uttava"
+msgid "C_lear"
+msgstr "_Tyhjennä"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Lisää _hymiö"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Suosikkikeskusteluhuone"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Kutsu _osallistuja…"
+msgid "Notify for All Messages"
+msgstr "Ilmoita kaikista viesteistä"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Siirrä välilehti _vasemmalle"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Näytä tuttavaluettelo"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Siirrä välilehti _oikealle"
+msgid "Invite _Participant…"
+msgstr "Kutsu _osallistuja…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Ilmoita kaikista viesteistä"
+msgid "C_ontact"
+msgstr "T_uttava"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Keskustelu"
+msgid "_Tabs"
+msgstr "V_älilehdet"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Irrota välilehti"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Suosikkikeskusteluhuone"
+msgid "_Previous Tab"
+msgstr "_Edellinen välilehti"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Seuraava välilehti"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Edellinen välilehti"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Kumoa Sulje välilehti"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Näytä tuttavaluettelo"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Siirrä välilehti _vasemmalle"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "V_älilehdet"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Siirrä välilehti _oikealle"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Kumoa Sulje välilehti"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Irrota välilehti"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3760,203 +3439,204 @@ msgstr "Huone"
 msgid "Auto-Connect"
 msgstr "Yhdistä automaattisesti"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s soittaa videopuhelun sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Puhelu käyttäjältä %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Vastaa käyttäen videota"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Saapuva videopuhelu taholta %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyä kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Salasana vaaditaan"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s haluaa luvan nähdä, milloin olet linjoilla"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"Viesti: %s"
+msgid "\nMessage: %s"
+msgstr "\nViesti: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Vastaanotetaan \"%s\" tuttavalta %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Lähetetään \"%s\" tuttavalle %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Virhe lähetettäessä \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Virhe lähetettäessä tiedostoa"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lähetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tarkistetaan tiedoston �%s� eheyttä"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Lasketaan tiivistettä tiedostolle �%s�"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Jäljellä"
 
@@ -3968,842 +3648,767 @@ msgstr "Tiedostosiirrot"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Poista valmiit, perutut ja epäonnistuneet tiedostonsiirrot luettelosta"
 
-#: ../src/empathy-import-dialog.c:84
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä "
-"ainoastaan Pidginistä."
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Tuo"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:88
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä ainoastaan Pidginistä."
+
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Tuo tilejä"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Anna salasana"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Vastinetta ei löytynyt"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Päivitä sovellus..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Sulje"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Sulje"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr ""
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Tuttava"
 
-#: ../src/empathy-main-window.c:2119
-msgid "Contact List"
-msgstr "Tuttavaluettelo"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Tuttavat _kartalla"
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Etsi _tuttavaluettelosta"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Liity _suosikkeihin"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hallitse suosikkeja"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Tilin asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Normaali koko"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Uusi keskustelu…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "Uusi _puhelu…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normaali koko _avatarien kera"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "Etsi _yhteystietoja..."
 
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Asetukset"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Tiedostosiirrot"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Poissa linjoilta olevat tuttavat"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "Näytä p_rotokollat"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Lajittele _nimen mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Lajittele _tilan mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Käyttäjätilit"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Estetyt yhteystiedot"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Tiivis koko"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Tiedostosiirrot"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Liity…"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Uusi keskustelu…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Poissa linjoilta olevat tuttavat"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normaali koko _avatarien kera"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Henkilötiedot"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Normaali koko"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Tiivis koko"
+
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "Etsi _yhteystietoja..."
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Liity…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Liity _suosikkeihin"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Jäsenet"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
-msgid ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s\n"
-"Vaaditaan kutsu: %s\n"
-"Vaaditaan salasana: %s\n"
-"Jäseniä: %s"
+msgid "%s\nInvite required: %s\nPassword required: %s\nMembers: %s"
+msgstr "%s\nVaaditaan kutsu: %s\nVaaditaan salasana: %s\nJäseniä: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ei voitu lopettaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ei voitu ladata huoneluetteloa"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Liity huoneeseen"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Anna liityttävän huoneen nimi tai napsauta yhtä tai useampaa huonetta "
-"luettelosta."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Anna liityttävän huoneen nimi tai napsauta yhtä tai useampaa huonetta luettelosta."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Anna palvelin, jolta huone löytyy, tai jätä tyhjäksi jos huone on tilin "
-"nykyisellä palvelimella"
+msgid "_Room:"
+msgstr "_Keskusteluhuone:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Liity huoneeseen"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Anna palvelin, jolta huone löytyy, tai jätä tyhjäksi jos huone on tilin nykyisellä palvelimella"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ei voitu ladata huoneluetteloa"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Huoneluettelo"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Keskusteluhuone:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Tuttava saapui linjoille"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Tuttava saapuu linjoille"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Kieli"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr ""
+msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr ""
+msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "Romeo, Romeo. missä olet Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Asetukset"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Näytä _hymiöt hymiökuvakkeina"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Näytä tuttava_luettelo huoneissa"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Käytös"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Avaa keskustelut:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Keskustelun _teema:"
+msgid "new ta_bs"
+msgstr "uu_siin välilehtiin"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
+msgid "new _windows"
+msgstr "uusiin _ikkunoihin"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Näytä tulevat tapahtumat tilarivillä"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when a contact comes online"
-msgstr "Näytä ponnahdusikkuna, kun tuttava tulee linjoille"
+msgid "Log conversations"
+msgstr "Tallenna keskustelut lokitiedostoon"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact goes offline"
-msgstr "Näytä ponnahdusikkuna, kun tuttava lähtee linjoilta"
+msgid "Behavior"
+msgstr "Käytös"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
+msgid "General"
+msgstr "Yleinen"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable spell checking for languages:"
-msgstr "Käytä kielentarkistusta kielille:"
+msgid "_Enable bubble notifications"
+msgstr "_Käytä ponnahdusikkunahuomautuksia"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "General"
-msgstr "Yleinen"
+msgid "Disable notifications when _away or busy"
+msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr ""
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "Näytä ponnahdusikkuna, kun tuttava tulee linjoille"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Näytä ponnahdusikkuna, kun tuttava lähtee linjoilta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Location sources:"
-msgstr "Sijainti:"
+msgid "Notifications"
+msgstr "Huomautukset"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Log conversations"
-msgstr "Tallenna keskustelut lokitiedostoon"
+msgid "_Enable sound notifications"
+msgstr "_Käytä merkkiääniä"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "Huomautukset"
+msgid "Disable sounds when _away or busy"
+msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Soita ääniä tapahtumille"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Privacy"
-msgstr "Yksityisyys"
+msgid "Sounds"
+msgstr "Äänet"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi "
-"ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Käytä _kaiunpoistoa puhelun laadun parantamiseksi"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show _smileys as images"
-msgstr "Näytä _hymiöt hymiökuvakkeina"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show contact _list in rooms"
-msgstr "Näytä tuttava_luettelo huoneissa"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Sounds"
-msgstr "Äänet"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Kaiun poisto tekee äänestäsi selkeämmän vastapuolen päässä, mutta siitä saattaa seurata ongelmia joillain tietokoneilla. Jos vastapuoli kuulee outoja ääniä puhelun aikana, kokeile poistaa kaiun poisto käytöstä ja soittaa puhelu uudelleen."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Spell Checking"
-msgstr "Kielentarkastus"
+msgid "_Publish location to my contacts"
+msgstr "_Julkaise sijainti tuttavilleni"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on "
-"asennettu sanakirja."
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Themes"
-msgstr "Teemat"
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Muunnelma:"
+msgid "_Reduce location accuracy"
+msgstr "_Heikennä sijaintitiedon tarkkuutta"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
+msgid "Privacy"
+msgstr "Yksityisyys"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Matkapuhelin"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Käytä ponnahdusikkunahuomautuksia"
+msgid "_Cellphone"
+msgstr "_Matkapuhelin"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Käytä merkkiääniä"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Sijainti:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Avaa uusi ikkuna uusille keskusteluille"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on asennettu sanakirja."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Julkaise sijainti tuttavilleni"
+msgid "Enable spell checking for languages:"
+msgstr "Käytä kielentarkistusta kielille:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Kielentarkastus"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Heikennä sijaintitiedon tarkkuutta"
+msgid "Chat Th_eme:"
+msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Muunnelma:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teemat"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera pois"
+msgid "Redial"
+msgstr "Yhdistä uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera päällä"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
+msgid "Video Preview"
+msgstr "Videon esikatselu"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
+msgid "Video On"
+msgstr "Video päällä"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Soita tuttavalle uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Esikatselu"
+msgid "Camera Off"
+msgstr "Kamera pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Yhdistä uudelleen"
+msgid "Disable camera and stop sending video"
+msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Esikatselu"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video pois"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video päällä"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera päällä"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Tuttavien karttanäkymä"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin-linkki"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin-vastaus"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Vianetsintäikkuna"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Lähetä pastebin-palveluun"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pysäytä"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Taso "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Virheenjäljitys"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Tietoa"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Alue"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Taso"
 
-#: ../src/empathy-debug-window.c:1642
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../src/empathy-debug-window.c:2114
+msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Valittu yhteyshallinta ei tue etävianetsintälaajennusta."
 
-#: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Älä näytä mitään valintaikkunoita; tee mitä tahansa työtä (esim. tuonti) ja "
-"poistu"
+msgstr "Älä näytä mitään valintaikkunoita; tee mitä tahansa työtä (esim. tuonti) ja poistu"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<käyttäjätunnus>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-tilit"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-tilit"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
-msgstr ""
+msgstr "Näytä tietty palvelu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr ""
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathyn virheenjäljitin"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-keskusteluasiakas"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Hylkää"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Vastaa videon kanssa"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Kieltäydy"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../src/empathy-notifications-approver.c:260
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr ""
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
+msgstr "%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Pidossa"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Vaimenna"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Kesto"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
 msgstr ""
 
-#~ msgid "%s is sending you a file. Do you want to accept it?"
-#~ msgstr "%s haluaa lähettää sinulle tiedoston. Haluatko vastaanottaa sen?"
-
-#~ msgid "_Accept"
-#~ msgstr "_Hyväksy"
-
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy on kysynyt tilien tuonnista"
-
-#~ msgid "All"
-#~ msgstr "Kaikki"
-
-#~ msgid "Select"
-#~ msgstr "Valitse"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Conversations"
-#~ msgstr "Keskustelut"
-
-#~ msgid "Previous Conversations"
-#~ msgstr "Aikaisemmat keskustelut"
-
-#~ msgid "_For:"
-#~ msgstr "_Ajalta:"
-
-#~ msgid "Show and edit accounts"
-#~ msgstr "Näytä ja muokkaa tilejä"
-
-#~ msgid "The hash of the received file and the sent one do not match"
-#~ msgstr "Vastaanotetun ja lähetetyn tiedoston tiiviste ei täsmää"
-
-#~ msgid "Enter Custom Message"
-#~ msgstr "Syötä itse määritelty viesti"
-
-#~ msgid "Add _New Preset"
-#~ msgstr "Lisää _uusi esitieto"
-
-#~ msgid "Saved Presets"
-#~ msgstr "Tallennetut esitiedot"
-
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
-
-#~ msgid "Show incoming messages in the messaging menu"
-#~ msgstr "Näytä saapuvat viestit viestivalikossa"
-
-#~ msgid "Match case"
-#~ msgstr "Huomioi kirjainkoko"
-
-#~ msgid "_Add…"
-#~ msgstr "_Lisää…"
-
-#~ msgid "Find Next"
-#~ msgstr "Etsi seuraava"
-
-#~ msgid "Find Previous"
-#~ msgstr "Etsi edellinen"
-
-#~ msgid "The certificate has expired"
-#~ msgstr "Varmenne on vanhentunut"
-
-#~ msgid ""
-#~ "The certificate has been revoked by the issuing Certification Authority"
-#~ msgstr "Varmenne on peruutettu varmenteen myöntäjän toimesta"
-
-#~ msgid "The certificate hasn't yet been activated"
-#~ msgstr "Varmennetta ei ole vielä aktivoitu"
-
-#~ msgid "The certificate is self-signed"
-#~ msgstr "Varmenne on itsetehty"
-
-#~ msgid "The certificate is malformed"
-#~ msgstr "Varmenne on muodostettu väärin"
-
-#~ msgid "The identity provided by the chat server cannot be verified.\n"
-#~ msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
-
-#~ msgid "The certificate is cryptographically weak"
-#~ msgstr "Varmenteen salausmenetelmä on heikko"
-
-#~ msgid ""
-#~ "The hostname verified by the certificate doesn't match the server name"
-#~ msgstr ""
-#~ "Varmenteessa ilmoitettu isäntänimi ei täsmää palvelimen nimen kanssa"
-
-#~ msgid "The certificate length exceeds verifiable limits"
-#~ msgstr "Varmenteen pituus ylittää sallitut rajat"
-
-#~ msgid "_Enabled"
-#~ msgstr "_Käytössä"
-
-#~ msgid "Meta-contact containing %u contact"
-#~ msgid_plural "Meta-contact containing %u contacts"
-#~ msgstr[0] "Metayhteystieto, joka sisältää %u yhteystiedon"
-#~ msgstr[1] "Metayhteystieto, joka sisältää %u yhteystietoa"
-
-#~ msgid ""
-#~ "Completely split the displayed meta-contact into the contacts it contains."
-#~ msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
-
-#~ msgid "Unlink meta-contact '%s'?"
-#~ msgstr "Poistetaanko metayhteystiedon �%s� linkitys?"
-
-#~ msgid ""
-#~ "Are you sure you want to unlink this meta-contact? This will completely "
-#~ "split the meta-contact into the contacts it contains."
-#~ msgstr ""
-#~ "Haluatko varmasti poistaa tämän metayhteystiedon linkityksen? "
-#~ "Metayhteystieto jaetaan sen sisältämiin yhteystietoihin."
-
-#~ msgid "The certificate is not signed by a Certification Authority"
-#~ msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr ""
 
-#~ msgid "The certificate does not have the expected fingerprint"
-#~ msgstr "Varmenteessa ei ole odotettua sormenjälkeä"
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr ""
 
-#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
-#~ msgstr ""
-#~ "Älä näytä mitään valintaikkunoita, paitsi jos käytössä on vain �Lähellä "
-#~ "olevat ihmiset� -tilejä"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Huomioi kirjainkoko"
 
-#~ msgid "Are you sure you want to remove '%s' from your contacts?"
-#~ msgstr "Haluatko varmasti poistaa kohteen '%s' yhteystiedoistasi?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
 
-#~ msgid "Your software is too old"
-#~ msgstr "Sovelluksesi on liian vanha"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Lisätään uutta tiliä"
 
-#~ msgid "Update software..."
-#~ msgstr "Päivitä sovellus..."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Lähellä olevat ihmiset"
 
-#~ msgid "Unavailable"
-#~ msgstr "Ei käytettävissä"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista että alla olevat tiedot ovat oikein."
 
-#~ msgid "Off"
-#~ msgstr "Kiinni"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Voit muuttaa näitä tietoja myöhemmin tai poistaa tämän ominaisuuden käytöstä valitsemalla tuttavaluettelossa <span style=\"italic\">Muokkaa → Käyttäjätilit</span>."
 
-#~ msgid "On"
-#~ msgstr "Päällä"
diff --git a/po/gl.po b/po/gl.po
index 9d4404c37..b5f491759 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 15:44+0100\n"
-"PO-Revision-Date: 2012-01-15 15:45+0100\n"
+"POT-Creation-Date: 2012-03-07 12:50+0100\n"
+"PO-Revision-Date: 2012-03-07 12:52+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -30,16 +30,25 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "IM Client"
-msgstr "Cliente de MI"
+msgstr "Cliente de mensaxaría instantánea"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Mensaxaría na Internet Empathy"
+msgstr "Mensaxaría instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
+msgstr "Converse en Google Talk, Facebook, MSN e moitos máis servizos de chat"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e Voz IP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e Voz IP"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
@@ -52,33 +61,33 @@ msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"Indica se deberían usarse xestores de conectividade para conectarse ou "
-"desconectarse automaticamente ou non."
+"Indica se se deberían usar xestores de conectividade para desconectarse/"
+"reconectarse automaticamente ou non."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Empathy should auto-connect on startup"
-msgstr "O Empathy debería conectarse automaticamente ao inicio"
+msgstr "Empathy debería autoconectarse ao inicio"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
-"ao inicio ou non."
+"Indica se Empathy debería iniciar a sesión nas súas contas automaticamente "
+"ao inicio."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Empathy should auto-away when idle"
-msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
+msgstr "Empathy debería mostrar ausencia ao estar inactivo"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
-"inactivo."
+"Indica se o Empathy debería entrar en modo de ausencia automaticamente se o "
+"usuario está inactivo."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
@@ -88,100 +97,112 @@ msgstr "Cartafol de descargas predeterminado do Empathy"
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "The default folder to save file transfers in."
+msgstr "O cartafol predeterminado no que gardar os ficheiros transferidos."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"O cartafol predeterminado en que gardar as transferencias de ficheiros."
+"Número máxico usado para comprobar se se deben executar as tarefas de limpeza"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleanin.c usa este número para comprobar se se deben executar "
+"as tarefas de limpeza. Os usuarios non deben cambiar esta chave manualmente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Show offline contacts"
-msgstr "Mostrar os contactos desconectados"
+msgstr "Mostrar contactos desconectados"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
-"Indica se mostrar ou non os contactos que están desconectados na lista de "
+"Indica se se debe mostrar os contactos que están desconectados na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Show avatars"
-msgstr "Mostrar os avatares"
+msgstr "Mostrar avatares"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
-"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
+"Indica se se deben mostrar os avatares dos contactos na lista de contactos e "
 "das xanelas de conversa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Show protocols"
-msgstr "Mostrar os protocolos"
+msgstr "Mostrar protocolos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
-"Indica se mostrar ou non os protocolos para os contacto na lista de "
+"Indica se se deben mostrar os protocolos para os contactos na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Show Balance in contact list"
-msgstr "Mostrar o balance na lista de contactos"
+msgstr "Mostrar crédito na lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Whether to show account balances in the contact list."
-msgstr "Indica se mostrar ou non os balances na lista de contactos."
+msgstr "Indica se se debe mostrar o crédito na lista de contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Compact contact list"
-msgstr "Lista de contactos compacta"
+msgstr "Lista compacta de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Whether to show the contact list in compact mode."
-msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
+msgstr "Indica se se debe mostrar a lista de contactos en modo compacto."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Hide main window"
-msgstr "Agochar a xanela principal"
+msgstr "Ocultar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide the main window."
-msgstr "Agochar a xanela principal."
+msgstr "Ocultar a xanela principal."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Default directory to select an avatar image from"
-msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
+msgstr "Cartafol predeterminado para seleccionar un avatar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "The last directory that an avatar image was chosen from."
-msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
+msgstr "Último cartafol do que escolleu unha imaxe de avatar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "Abrir as novas conversas en xanelas separadas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Always open a separate chat window for new chats."
-msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
+msgstr "Abrir sempre unha xanela de conversa separada para as conversas novas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Display incoming events in the status area"
-msgstr "Mostrar os eventos de entrada na área de estado"
+msgstr "Mostrar os eventos entrantes na área de estado"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -189,160 +210,169 @@ msgstr ""
 "Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
 "directamente ao usuario."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "The position for the chat window side pane"
 msgstr "A posición do panel lateral da xanela de conversa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Show contact groups"
+msgstr "Mostrar grupos de contactos"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se se deben mostrar os grupos na lista de contactos."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación da lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
-"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
-"ordenará a lista de contactos por estado."
+"Que criterio usar ao ordenar a lista de contactos. O predeterminado é "
+"ordenar polo estado do contacto co valor «state» (estado). Un valor "
+"«name» (nome) ordenará a lista de contactos polo nome."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play a sound to notify of events."
-msgstr "Indica se reproducir ou non un son para notificar os eventos."
+msgstr "Indica se se debe reproducir un son para notificar os eventos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Disable sounds when away"
-msgstr "Desactivar os sons cando se está ausente"
+msgstr "Desactivar os sons ao ausentarse"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
-"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
+"Indica se se debe reproducir un son para notificar cando se está ocupado ou "
 "ausente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
-msgstr "Reproducir un son para as mensaxes entrantes"
+msgstr "Reproducir un son cando cheguen mensaxes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
+msgstr "Indica se se debe reproducir un son para notificar mensaxes entrantes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un son para as mensaxes saíntes"
+msgstr "Reproducir un son ao enviar mensaxes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
+msgstr ""
+"Indica se se debe reproducir un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
+msgstr "Indica se se debe reproducir un son para notificar as conversas novas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un son cando un contacto inicia unha sesión"
+msgstr "Reproducir un son cando un contacto inicie sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos inician "
-"unha sesión na rede."
+"Indica se se debe reproducir un son para notificar os inicio de sesión dos "
+"contactos na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos terminan "
+"Indica se se debe reproducir un son para notificar que os contactos terminan "
 "unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log in"
-msgstr "Reproducir un son cando iniciamos a sesión"
+msgstr "Reproducir un son cando inicio sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging into a network."
-msgstr ""
-"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
+msgstr "Indica se se debe reproducir un son cando se inicia sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando saímos da sesión"
+msgstr "Reproducir un son cando ao saír da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
+msgstr "Indica se se debe reproducir un son cando se sae da sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Disable popup notifications when away"
 msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
 "ou ocupado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -351,110 +381,122 @@ msgstr ""
 "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs in"
 msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Pop up notifications when a contact logs out"
 msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Show contact list in rooms"
 msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme"
 msgstr "Tema da xanela de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Chat window theme variant"
 msgstr "Variante do tema da xanela de charla"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Path of the Adium theme to use"
 msgstr "Ruta do tema de Adium para usar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
 "deberían ser activadas."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a outros usuarios cando vostede está escribindo"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se enviar ou non os estados de conversa «escribindo» ou «pausado». No "
+"afecta realmente ao estado «ausente»."
+
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Spell checking languages"
 msgstr "Idiomas para a corrección ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
@@ -462,12 +504,12 @@ msgstr ""
 "ex., «gl, pt, en»)."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
@@ -475,12 +517,12 @@ msgstr ""
 "as quere verificar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -489,63 +531,63 @@ msgstr ""
 "alcume (tabulador) nunha conversa de grupo."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se o Empathy debería usar o avatar dos contactos como a icona da "
 "xanela da conversa ou non."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Last account selected in Join Room dialog"
 msgstr "Última conta seleccionada no diálogo Unirse á sala"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 "Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera device"
 msgstr "Dispositivo da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
 "dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Camera position"
 msgstr "Posición da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Position the camera preview should be during a call."
 msgstr ""
 "Posición onde debe estar a vista previa da cámara durante unha chamada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Echo cancellation support"
 msgstr "Compatibilidade de cancelación de eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -553,123 +595,113 @@ msgstr ""
 "Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
 "principal co botón 'x' da barra de título."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
 "a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se o Empathy debería ou non reducir a precisión de localización por "
 "motivos de privacidade."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
-
 # rever
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr ""
 "Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
-msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
+msgstr "O contacto remoto non admite a tranferencia de ficheiros"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
@@ -685,238 +717,243 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
-msgstr "Non se proporcionou o certificado"
+msgstr "Non se forneceu o certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
-msgstr "Certificado non fiábel"
+msgstr "Certificado sen confianza"
 
 # rever
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
-msgstr "O certificado caducou"
+msgstr "O certificado expirou"
 
 # rever
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
-msgstr "Erro de certificado"
+msgstr "Erro do certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Este recurso xa está conectado ao servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta xa está conectada ao servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
-"A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
+"A conexión foi substituída por unha conexión nova empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
-msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
+msgstr ""
+"Nestes intres o servidor está demasiado ocupado para xestionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
-msgstr "O certificado foi revocado"
+msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "A lonxitude do certificado do servidor ou a profundidade da cadea do "
 "certificado do servidor excede os límites impostos pola biblioteca de "
-"criptografía."
+"criptografía"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
 # rever
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
-msgstr "Persoas próximas"
+msgstr "Xente cerca"
 
 # rever
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Hai %d segundo"
-msgstr[1] "Hai %d segundos"
+msgstr[0] "hai %d segundo"
+msgstr[1] "hai %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Hai %d minuto"
-msgstr[1] "Hai %d minutos"
+msgstr[0] "hai %d minuto"
+msgstr[1] "hai %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "Hai %d hora"
-msgstr[1] "Hai %d horas"
+msgstr[0] "hai %d hora"
+msgstr[1] "hai %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] "Hai %d día"
-msgstr[1] "Hai %d días"
+msgstr[0] "hai %d día"
+msgstr[1] "hai %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "Hai %d semana"
-msgstr[1] "Hai %d semanas"
+msgstr[0] "hai %d semana"
+msgstr[1] "hai %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
-msgstr[0] "Hai %d mes"
-msgstr[1] "Hai %d meses"
+msgstr[0] "hai %d mes"
+msgstr[1] "hai %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
-msgstr "Tódalas contas"
+msgstr "Todas as contas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Conta"
 
@@ -934,30 +971,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
-msgstr "Nome de _usuario:"
+msgstr "Nome de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
-msgstr "A_plicar"
+msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
-msgstr "Iniciar sesi_ón"
+msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
@@ -967,20 +1004,20 @@ msgstr "Crear unha nova conta no servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sobre %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Conta nova"
 
@@ -1013,7 +1050,7 @@ msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 #: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
-msgstr "Lembrar o contrasinal"
+msgstr "Lembrar contrasinal"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
@@ -1044,7 +1081,7 @@ msgstr "_Servidor:"
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
-msgstr "Avanzado"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
@@ -1073,7 +1110,7 @@ msgstr "I_D de sesión:"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "<b>Example:</b> username"
-msgstr "<b>Exemplo:</b> nomeusuario"
+msgstr "<b>Exemplo:</b> usuario"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
@@ -1126,7 +1163,7 @@ msgstr "TLS"
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
-msgstr "Rexistrar"
+msgstr "Rexistrador"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
@@ -1214,7 +1251,7 @@ msgstr "Cal é o seu ID de Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Examplo:</b> usuario@gmail.com"
+msgstr "<b>Exemplo:</b> usuario@gmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
@@ -1227,7 +1264,7 @@ msgstr "<b>Exemplo:</b> user@jabber.org"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorar os erros do certificado SSL"
+msgstr "I_gnorar os erros de certificados SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
@@ -1240,17 +1277,17 @@ msgstr "Rec_urso:"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requírese o c_ifrado (TLS/SSL)"
+msgstr "Require c_ifrado (TLS/SSL)"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "Use old SS_L"
-msgstr "Usar o SS_L antigo"
+msgstr "Usar SS_L antigo"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
-msgstr "Ignorar as configuracións do servidor"
+msgstr "Sobrescribir os axustes do servidor"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
@@ -1258,7 +1295,7 @@ msgstr "Cal é o seu identificador de Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
-msgstr "Cal é o ID de Jabber que desexa?"
+msgstr "Cal é o ID de usuario que quere para Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
 msgid "What is your Jabber password?"
@@ -1266,7 +1303,7 @@ msgstr "Cal é o seu contrasinal de Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
-msgstr "Cal é o contrasinal de Jabber que desexa?"
+msgstr "Cal é o contrasinal que desexa para Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
@@ -1274,11 +1311,11 @@ msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "Cal é o seu contrasinal para Windows Live?"
+msgstr "Cal é o seu ID de Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
-msgstr "Cal é o seu contrasinal para Windows Live?"
+msgstr "Cal é o seu contrasinal de Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
@@ -1299,7 +1336,7 @@ msgstr "Nome _publicado:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "ID para _Jabber:"
+msgstr "ID de _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "E-_mail address:"
@@ -1311,15 +1348,15 @@ msgstr "Nome de _usuario:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Exemplo:</b> usuaruio@meu.servidor.sip"
+msgstr "<b>Exemplo:</b> usuario@meu.servidor.sip"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles"
+msgstr "Usar esta conta para chamar a te_léfonos fixos e móbiles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "NAT Traversal Options"
-msgstr "Opcións do NAT transversal"
+msgstr "Opcións de NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Proxy Options"
@@ -1349,7 +1386,7 @@ msgstr "Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
-msgstr "Opcións de Keep-Alive"
+msgstr "Opcións de «Keep-Alive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Mechanism:"
@@ -1369,11 +1406,11 @@ msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
-msgstr "Enrutado aberto"
+msgstr "Enrutado impreciso"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Ignore TLS Errors"
-msgstr "Ignorar os erros TLS"
+msgstr "Ignorar erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Port:"
@@ -1395,7 +1432,7 @@ msgstr "I_D de Yahoo:"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
-msgstr "I_gnorar os convites para conferencias e salas de conversa"
+msgstr "I_gnorar convites a conferencias e salas de conversa"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
@@ -1408,7 +1445,7 @@ msgstr "Cal é o seu ID para Yahoo?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
-msgstr "Cal é o seu contrasinal para Yahoo?"
+msgstr "Cal é o seu contrasinal de Yahoo!?"
 
 # rever
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
@@ -1432,7 +1469,7 @@ msgstr "Seleccione a súa imaxe de avatar"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
-msgstr "Obter unha foto..."
+msgstr "Tomar unha foto…"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
@@ -1451,233 +1488,240 @@ msgstr "Todos os ficheiros"
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Produciuse un erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "O contacto especificado non admite as chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "O contacto especificado está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "O contacto especificado non é válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo non admite as chamadas de emerxencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Non ten crédito dabondo para facer esta chamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
-msgstr "Ese asunto non se admite nesta conversación"
+msgstr "O asunto non é ocmpatíbel nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
-"actual"
+"/part [<ID da sala de conversa>] [<razón>]: abandonar a sala de char, por "
+"omisión a actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <contact id> [<message>], abre unha conversa privada"
+msgstr "/query <id do contacto> [<mensaxe>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <contact id> <message>, abre unha conversa privada"
+msgstr "/msg <id do contacto> <mensaxe>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
+msgstr "/nick <alcume>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
+msgstr "/me <mensaxe>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <message>, enviar <message> á conversa actual. Isto úsase para enviar "
+"/say <mensaxe>, enviar <mensaxe> á conversa actual. Isto úsase para enviar "
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
-"definida, mostra o seu uso."
+"/help [<orde>], mostra todas as ordes admitidas. Se <orde> está definida, "
+"mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
-msgstr "contacto incorrecto"
+msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
-msgstr "a mensaxe é demasiado longa"
+msgstr "mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema estabelecido por %s a: %s"
+
+# rever
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
-msgstr "Non se definiu un asunto"
+msgstr "Non se definiu o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1685,12 +1729,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1698,17 +1742,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1718,18 +1762,18 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1737,55 +1781,55 @@ msgstr "%s agora é coñecido como %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1855,34 +1899,30 @@ msgstr "_Abrir a ligazón"
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -2061,7 +2101,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localización"
 
@@ -2089,6 +2129,18 @@ msgstr "Gardar o avatar"
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles persoais"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles do contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nome completo"
@@ -2172,12 +2224,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Localización</b> o (date)\t"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Detalles do contacto"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -2201,11 +2247,11 @@ msgstr "Versión:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2213,17 +2259,17 @@ msgstr ""
 "Seleccione os grupos en que quere que aparezan estes contactos. Note que "
 "pode seleccionar máis dun grupo ou ningún."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2243,168 +2289,150 @@ msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar a información de contacto"
 
-# rever
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos ligados"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccione os contactos a ligar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa do contacto novo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Conversa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts non está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Instale o programa gnome-contacts para acceder aos detalles dos contactos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligar contactos…"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2413,7 +2441,7 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
@@ -2458,181 +2486,137 @@ msgstr "servidor novo"
 msgid "SSL"
 msgstr "SSL"
 
-# rever
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desligar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Separar por completo o contacto ligado nos contactos que contén."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desexa desligar os contactos ligados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Está seguro que quere desligar estes contactos ligados? Isto separará por "
-"completo os contactos ligados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desligar"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y ás %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A chamada levou %s, rematou ás %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Mañá"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Calquera momento"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
@@ -2722,7 +2706,7 @@ msgid "There was an error starting the conversation"
 msgstr "Produciuse un erro ao iniciar a conversa"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Escriba o identificador dun contacto ou un número de teléfono:"
 
@@ -2732,17 +2716,17 @@ msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova chamada"
 
@@ -2799,7 +2783,7 @@ msgstr "Mensaxes personalizadas…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Conta nova de %s"
@@ -2878,12 +2862,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2897,7 +2881,7 @@ msgstr "Simple"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
-msgstr "Limpo"
+msgstr "Limpar"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
@@ -2967,35 +2951,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome do servidor do certificado: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "A conexión non é confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A conexión non confiábel. Desexa continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta elección para futuras conexións"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3004,7 +2992,7 @@ msgstr ""
 "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
 "dispoñíbeis. Elixa outra localización."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -3186,25 +3174,25 @@ msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3269,239 +3257,85 @@ msgstr ""
 "org>, 2009.\n"
 "Antón Méixome <meixome@mancomun.org>, 2009."
 
-# rever
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Produciuse un erro ao importar as contas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Produciuse un erro ao procesar os detalles da conta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Produciuse un erro ao crear a conta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Produciuse un erro."
-
-# rever
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A mensaxe do erro foi: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
-"deste asistente e engadir as contas máis tarde desde o menú Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Produciuse un erro"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Que clase de conta de chat ten?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ten algunha outra conta de chat que queira estabelecer?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introduza os seus detalles de conta"
-
-# rever
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Que clase de conta de chat quere crear?"
-
-# rever
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Quere crear outras contas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introduza os detalles para a nova conta"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy pode falar en liña con persoas próximas e con amigos e colegas "
-"que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. "
-"Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Si, importar os detalles da miña conta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Si, introducirei os meus detalles de conta agora"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Non, quero crear unha conta nova"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione as contas que quere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Si"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Non, isto é todo por agora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy pode descubrir automaticamente e conversar con xente conectada na "
-"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
-"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
-"detalles máis tarde ou desactivar esta característica usando o diálogo "
-"\"Contas\""
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Contas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_Non quero activar esta característica por agora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Vostede non poderá conversar con xente conectada á súa rede local xa que "
-"telepathy-salut non está instalado.\n"
-"Se quere activar esta característica, instale o paquete telepathy-salut e "
-"cree unha conta de Persoas próximas desde o diálogo Contas"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut non está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de contas de mensaxaría e VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Benvido/a ao Empathy"
-
-# rever
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "_Importar as súas contas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Insira os detalles persoais"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Hai modificacións sen gardar respecto da súa conta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "A súa nova conta aínda non foi gardada."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta conta desactivouse porque básease nun «backend» non compatíbel. Instale "
+"telepathy-haze e reinicie a sesión para migrar esta conta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar a súa información persoal"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Isto non eliminará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3510,16 +3344,24 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desactivar"
 
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Conectar"
+
 # rever
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3537,8 +3379,8 @@ msgid "_Import…"
 msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando a información da conta"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:5
@@ -3546,136 +3388,127 @@ msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"Para engadir unha conta nova primeiro ten que instalar unha infraestrutura "
-"para cada protocolo que quere usar."
+"Para engadir unha conta nova primeiro ten que instalar unha «backend» para "
+"cada protocolo que quere usar."
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Non hai ningún protocolo instalado"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Cargando a información da conta"
+msgid "No protocol backends installed"
+msgstr "Non hai «backends» de protocolos instalados"
 
 # rever
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticación Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
 # rever
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Persoas próximas"
-
-# rever
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
-msgstr "- Cliente de son/vídeo Empathy"
+msgstr "- Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
-msgstr "Cliente de son/vídeo Empathy"
+msgstr "Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
-msgstr "Entrada de audio"
+msgstr "Entrada de voz"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
-msgstr "Marcador"
+msgstr "Teclado de chamada"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
-msgstr "Detalles do contacto"
+msgstr "Detalles"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
-msgstr "Chamar con %s"
+msgstr "Chamada con %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3684,8 +3517,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3694,8 +3527,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3704,52 +3537,52 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
-"Produciuse un fallo non esperado no compoñente Telepathy. <a "
-"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
-"xanela «Depurar» no menú Axuda."
+"Produciuse un fallo non esperado no compoñente Telepathy. <a href=\"%s"
+"\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
+"«Depuración» no menú Axuda."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
@@ -3768,32 +3601,32 @@ msgstr "_Cámara"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "_Settings"
-msgstr "_Configuracións"
+msgstr "_Preferencias"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Ver"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "A_xuda"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
-msgstr "_Contidos"
+msgstr "_�ndice"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
-msgstr "_Depuración"
+msgstr "_Depurar"
 
 #: ../src/empathy-call-window.ui.h:10
 msgid "Swap camera"
-msgstr "Trocar cámara"
+msgstr "Intercambiar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
@@ -3823,19 +3656,19 @@ msgstr "Videochamada"
 
 #: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
-msgstr "Iniciar vídeochamada"
+msgstr "Iniciar unha videochamada"
 
 #: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
-msgstr "Iniciar chamada de son"
+msgstr "Iniciar unha chamada de voz"
 
 #: ../src/empathy-call-window.ui.h:20
 msgid "Show dialpad"
-msgstr "Mostrar marcador"
+msgstr "Mostrar teclado de chamada"
 
 #: ../src/empathy-call-window.ui.h:21
 msgid "Display the dialpad"
-msgstr "Desactivar o marcador"
+msgstr "Mostrar o teclado de chamada"
 
 # rever
 #: ../src/empathy-call-window.ui.h:22
@@ -3850,7 +3683,7 @@ msgstr "Activar/desactivar transmisión de vídeo"
 #: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Send Audio"
-msgstr "Enviar audio"
+msgstr "Enviar voz"
 
 #: ../src/empathy-call-window.ui.h:25
 #: ../src/empathy-streamed-media-window.ui.h:12
@@ -3864,8 +3697,8 @@ msgstr "Códec de codificación:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -3884,45 +3717,93 @@ msgstr "Candidato remoto:"
 msgid "Local Candidate:"
 msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
-msgstr "Auto"
+msgstr "Son"
+
+# rever
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Pechar esta xanela?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que "
+"se una de novo."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Pechar esta xanela fará que abandone unha sala de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+msgstr[1] ""
+"Pechar esta xanela fará que abandone %u salas de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Pechar %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Non recibirá máis mensaxes deste chat até que se una de novo."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Pechar a xanela"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Abandonar a sala"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] "%s (%d non lido)"
-msgstr[1] "%s (%d non lidos)"
+msgstr[0] "%s (%d sen ler)"
+msgstr[1] "%s (%d sen ler)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e outro %u)"
 msgstr[1] "%s (e outros %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] "%s (%d non lido de outros)"
-msgstr[1] "%s (%d non lidos de outros)"
+msgstr[0] "%s (%d sen ler de outros)"
+msgstr[1] "%s (%d sen ler de outros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] "%s (%d non lido de todos)"
-msgstr[1] "%s (%d non lidos de todos)"
+msgstr[0] "%s (%d sen ler de todos)"
+msgstr[1] "%s (%d sen ler de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3930,7 +3811,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -3940,11 +3821,11 @@ msgstr "_Conversa"
 
 #: ../src/empathy-chat-window.ui.h:2
 msgid "C_lear"
-msgstr "_Limpo"
+msgstr "_Limpar"
 
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
-msgstr "Inse_rir unha emoticona"
+msgstr "Inse_rir emoticona"
 
 # rever
 #: ../src/empathy-chat-window.ui.h:4
@@ -3954,16 +3835,16 @@ msgstr "Sala de conversa _favorita"
 # rever
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Notify for All Messages"
-msgstr "Notificar todas as mensaxes"
+msgstr "Notificar para todas as mensaxes"
 
 # rever
 #: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
-msgstr "Mo_strar a lista de contactos"
+msgstr "Mo_strar lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
 msgid "Invite _Participant…"
-msgstr "Invitar _participante…"
+msgstr "Convidar _participante…"
 
 #: ../src/empathy-chat-window.ui.h:8
 msgid "C_ontact"
@@ -3984,19 +3865,19 @@ msgstr "Lapela _seguinte"
 
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Undo Close Tab"
-msgstr "_Desfacer o peche da lapela"
+msgstr "_Desfacer pechar lapela"
 
 #: ../src/empathy-chat-window.ui.h:14
 msgid "Move Tab _Left"
-msgstr "Mover a lapela á _esquerda"
+msgstr "Mover lapela á _esquerda"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "Move Tab _Right"
-msgstr "Mover a lapela á _dereita"
+msgstr "Mover lapela á _dereita"
 
 #: ../src/empathy-chat-window.ui.h:16
 msgid "_Detach Tab"
-msgstr "Des_prender lapela"
+msgstr "_Desacoplar lapela"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -4009,114 +3890,114 @@ msgstr "Sala"
 # rever
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
-msgstr "Conectar automaticamente"
+msgstr "Autoconectar"
 
 # rever
 #: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
-msgstr "Xestionar as salas preferidas"
+msgstr "Xestionar as salas favoritas"
 
 # rever
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
+msgstr "%s está chamándoo con vídeo. Desexa responderlle?"
 
 # rever
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "%s estao chamando. Quérelle responder?"
+msgstr "%s estao chamando. Quere responder?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
-msgstr "Convite para unha sala"
+msgstr "Convite a unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "Invitación a unirse a %s"
+msgstr "Convite para unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s estao convidando a unirse a %s"
+msgstr "%s está convidándoo a unirse a %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
-msgstr "_Declinar"
+msgstr "_Rexeitar"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cando vostede está dispoñíbel"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4197,7 +4078,7 @@ msgstr "Produciuse un erro ao enviar un ficheiro"
 #: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr "recibiuse «%s» de %s"
+msgstr "«%s» recibido de %s"
 
 # rever
 #. translators: first %s is filename, second %s
@@ -4205,7 +4086,7 @@ msgstr "recibiuse «%s» de %s"
 #: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr "enviado «%s» a %s"
+msgstr "«%s» enviado a %s"
 
 #: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
@@ -4219,12 +4100,12 @@ msgstr "Agardando pola resposta do outro participante"
 #: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr "Verificando a integridade de «%s»"
+msgstr "Comprobando a integridade de «%s»"
 
 #: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
-msgstr "Aplicando o hash «%s»"
+msgstr "Obtendo o «hash» de «%s»"
 
 #: ../src/empathy-ft-manager.c:1025
 msgid "%"
@@ -4249,8 +4130,12 @@ msgstr ""
 "Eliminar da lista as transferencias de ficheiros rematadas, canceladas e as "
 "que fallaron"
 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
 # rever
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4259,83 +4144,101 @@ msgstr ""
 "permite a importación de contas do Pidgin."
 
 # rever
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar unha conta para ver contactos aquí."
+
 # rever
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "As contas de %s non se poden usar até que non teña actualizado o seu "
 "software %s."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar a conta"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar o saldo da conta"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar unha das súas contas para ver contactos aquí."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Debe activar %s para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración da conta"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4358,11 +4261,11 @@ msgstr "Trans_ferencias de ficheiros"
 # rever
 #: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "_Offline Contacts"
-msgstr "Mostrar os contactos _desconectados"
+msgstr "Contactos _desconectados"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
-msgstr "Mostrar os p_rotocolos"
+msgstr "Mostrar p_rotocolos"
 
 #: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Credit Balance"
@@ -4370,67 +4273,63 @@ msgstr "Crédito"
 
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Contacts on a _Map"
-msgstr "Contactos no mapa"
+msgstr "Contactos no _mapa"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "Contactos _bloqueados"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "_Buscar na lista de contactos"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "Sa_la"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
-msgstr "Unirse a pre_feridos"
+msgstr "Unirse a _favoritas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
-msgstr "Xestionar as preferidas"
+msgstr "Xestionar favoritas"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.c:369
@@ -4452,12 +4351,17 @@ msgid ""
 "Members: %s"
 msgstr ""
 "%s\n"
-"Convite requirido: %s\n"
-"Contrasinal requirido: %s\n"
+"Requírese convite: %s\n"
+"Requírese contrasinal: %s\n"
 "Membros: %s"
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Si"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Non"
 
@@ -4501,7 +4405,7 @@ msgstr "Non foi posíbel ler a lista da sala"
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
-msgstr "Lista de _salas"
+msgstr "Lista de salas"
 
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
@@ -4517,7 +4421,7 @@ msgstr "Conversa nova"
 
 # rever
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
@@ -4540,47 +4444,47 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
+msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Nega ao teu pai e rexeita o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou, se non queres, xúrame tan só que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr "Y deixarei eu de ser unha Capuleto."
+msgstr "E deixarei eu de ser un Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Debo escoitar máis ou contestar ao dito?"
 
 # rever
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4592,91 +4496,98 @@ msgstr "Mostrar as _emoticonas como imaxes"
 # rever
 #: ../src/empathy-preferences.ui.h:2
 msgid "Show contact _list in rooms"
-msgstr "Mostrar a _lista de contactos nas salas"
+msgstr "Mostrar _lista de contactos en salas"
 
 #: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aparencia"
 
-# rever
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "A_brir as conversas novas en xanelas separadas"
+msgid "Start chats in:"
+msgstr "Iniciar conversas en:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "lapelas no_vas"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "xan_elas novas"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
-msgstr "Mostrar os eventos de entrada na área de notificación"
+msgstr "Mostrar os eventos entrantes na área de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
-msgstr "_Conectar automaticamente ao iniciar"
+msgstr "_Conectar automaticamente ao inicio"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Rexistrar conversas"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Xeral"
 
 # rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
-msgstr "_Activar as burbullas de notificación"
+msgstr "_Activar notificacións de burbulla"
 
 # rever
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
-msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
+msgstr "Desactivar notificacións ao estar _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
-msgstr "Activar as notificacións cando a _conversa non está enfocada"
+msgstr "Activar notificacións cando a _conversa non teña o foco"
 
 # rever
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
-msgstr "Activar as notificacións cando un contacto está conectado"
+msgstr "Activar notificacións cando un contacto se conecta"
 
 # rever
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
-msgstr "Activar as notificacións cando un contacto está desconectado"
+msgstr "Activar notificacións cando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
-msgstr "_Activar as notificacións de son"
+msgstr "_Activar notificacións de son"
 
 # rever
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4688,48 +4599,48 @@ msgstr ""
 "persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
 "tente desactivando a cancelación do eco e reiniciando a chamada."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a miña localización aos meus contactos"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"Unha reducida precisión de localización significa que nada máis preciso que "
-"a súa cidade, rexión e país serán publicados. As coordenadas GPS serán "
+"Unha reducida precisión de localización significa que non se publicará nada "
+"máis preciso que a súa cidade, rexión e país. As coordenadas GPS serán "
 "aproximadas a 1 valor decimal."
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
-msgstr "_Reducir a precisión de localización"
+msgstr "_Reducir a precisión da localización"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
 # rever
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Teléfono móbil"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wifi)"
+msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4738,24 +4649,24 @@ msgstr ""
 "dicionario instalado."
 
 # rever
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
-msgstr "T_ema da conversa:"
+msgstr "T_ema do chat:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temas"
 
@@ -4769,7 +4680,7 @@ msgstr "_Saír"
 
 #: ../src/empathy-streamed-media-window.ui.h:3
 msgid "Redial"
-msgstr "Remarcación"
+msgstr "Remarcar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
 msgid "V_ideo"
@@ -4782,7 +4693,7 @@ msgstr "Vídeo desactivado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
 msgid "Video Preview"
-msgstr "Previsualizar o vídeo"
+msgstr "Previsualizar vídeo"
 
 # rever
 #: ../src/empathy-streamed-media-window.ui.h:7
@@ -4822,115 +4733,132 @@ msgstr "Activar cámara e enviar o vídeo"
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Ligazón a pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Resposta de pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datos demasiado longos para un pegado sinxelo. Garde o rexistro nun ficheiro."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar a pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
-msgstr "Tempo"
+msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
-"O xestor de conexión seleccionado non é compatíbel coa extensión de "
+"O xestor de conexións seleccionado non é compatíbel coa extensión de "
 "depuración remota."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
-msgstr "Invitar participante"
+msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
-msgstr "Seleccione o contacto que quere invitar á conversa:"
+msgstr "Seleccione un contacto para convidalo á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
-msgstr "Invitar"
+msgstr "Convidar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
+msgstr ""
+"Non mostra ningún diálogo, realizar calquera traballo (p.ex. importar) e sair"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"Non mostrar ningún diálogo a non ser que só existan contas «Persoas próximas»"
+"Non mostrar ningún diálogo a non ser que só existan contas «Xente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
-"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
-"foo_40exemplo_2eorg0)"
+"Conta fornecida inicialmente seleccionada (p.ex. gabble/jabber/exemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar o asistente de contas"
-
-# rever
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
@@ -4947,87 +4875,87 @@ msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
 # rever
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
-msgstr "Declinar"
+msgstr "Rexeitar"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceptar"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Fornecer"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
-msgstr "i"
+msgstr "Información"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
-msgstr "O seu balance actual é %s."
+msgstr "O seu crédito actual é %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Non ten crédito dabondo para facer esta chamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -5035,11 +4963,214 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Que tipo de conta ten?"
+
 # rever
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Engadindo conta nova"
 
+# rever
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Xente cerca"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy pode descubrir automaticamente e conversar con xente conectada na "
+"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
+"detalles de abaixo son correctos."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Pode cambiar de forma sinxela eses detalles máis tarde ou desactivar esta "
+"característica usando o diálogo <span style=\"italic\">Editar → Contas</"
+"span> na Lista de contactos."
+
+# rever
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Produciuse un erro ao importar as contas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Produciuse un erro ao procesar os detalles da conta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Produciuse un erro ao crear a conta."
+
+#~ msgid "There was an error."
+#~ msgstr "Produciuse un erro."
+
+# rever
+#~ msgid "The error message was: %s"
+#~ msgstr "A mensaxe do erro foi: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
+#~ "deste asistente e engadir as contas máis tarde desde o menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Produciuse un erro"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Ten algunha outra conta de chat que queira estabelecer?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introduza os seus detalles de conta"
+
+# rever
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Que clase de conta de chat quere crear?"
+
+# rever
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Quere crear outras contas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introduza os detalles para a nova conta"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy pode falar en liña con persoas próximas e con amigos e "
+#~ "colegas que usen Google Talk, AIM, Windows Live e calquera outro programa "
+#~ "de chat. Cun micrófono ou unha cámara web tamén pode ter chamadas de "
+#~ "audio ou vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Ten algunha outra conta que estea usando con outro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Si, importar os detalles da miña conta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Si, introducirei os meus detalles de conta agora"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Non, quero crear unha conta nova"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione as contas que quere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Non, isto é todo por agora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Contas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Non quero activar esta característica por agora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Vostede non poderá conversar con xente conectada á súa rede local xa que "
+#~ "telepathy-salut non está instalado.\n"
+#~ "Se quere activar esta característica, instale o paquete telepathy-salut e "
+#~ "cree unha conta de Persoas próximas desde o diálogo Contas"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut non está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de contas de mensaxaría e VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Benvido/a ao Empathy"
+
+# rever
+#~ msgid "Import your existing accounts"
+#~ msgstr "_Importar as súas contas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Insira os detalles persoais"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+# rever
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar o asistente de contas"
+
+# rever
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos ligados"
+
+# rever
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccione os contactos a ligar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa do contacto novo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
+
+# rever
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Ligar contactos…"
+
+# rever
+#~ msgid "Link Contacts"
+#~ msgstr "Ligar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desligar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Separar por completo o contacto ligado nos contactos que contén."
+
+#~ msgid "_Link"
+#~ msgstr "_Ligar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desexa desligar os contactos ligados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Está seguro que quere desligar estes contactos ligados? Isto separará por "
+#~ "completo os contactos ligados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desligar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información persoal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información _persoal"
+
+# rever
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_brir as conversas novas en xanelas separadas"
+
 #~ msgid "Call volume"
 #~ msgstr "Volume da chamada"
 
diff --git a/po/he.po b/po/he.po
index ff11676c6..87af33c62 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-30 10:44+0200\n"
-"PO-Revision-Date: 2011-12-30 10:45+0200\n"
+"POT-Creation-Date: 2012-03-02 14:11+0200\n"
+"PO-Revision-Date: 2012-03-02 14:14+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -33,6 +33,16 @@ msgstr "�Empathy מסרי� מידיי�"
 msgid "IM Client"
 msgstr "לקוח מסרי� מידיי�"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ניהול חשבונות התכתבות ו־VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "חשבונות התכתבות ו־VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Always open a separate chat window for new chats."
@@ -162,286 +172,292 @@ msgid "Hide the main window."
 msgstr "Hide the main window."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "Last account selected in Join Room dialog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "Position the camera preview should be during a call."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Show Balance in contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Show contact groups"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Show protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "The theme variant that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Whether Empathy can use the GPS to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Whether Empathy can use the cellular network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Whether to play a sound to notify of contacts logging into the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Whether to play a sound to notify of contacts logging out of the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Whether to play a sound when logging into a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Whether to show account balances in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Whether to show contacts that are offline in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ניהול חשבונות התכתבות ו־VoIP"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "חשבונות התכתבות ו־VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -468,7 +484,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "המשתתף ה�חר ל� יכול להעביר �ת הקובץ"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "סיבה ל� ידועה"
 
@@ -489,7 +505,7 @@ msgid "The selected file is empty"
 msgstr "הקובץ הנבחר ריק"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "שיחה של� נענתה מ�ת %s"
@@ -505,221 +521,225 @@ msgstr "התקשרת ל%s"
 msgid "Call from %s"
 msgstr "שיחה מ�ת %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "בלתי נר�ה"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "ל� מחובר"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ל� צויינה סיבה"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "המצב מוגדר כמנותק"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "שגי�ת רשת"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "ה�ימות נכשל"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "שגי�ת הצפנה"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "הש� בשימוש"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ל� סופקה תעודה"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "התעודה �ינה מ�ובטחת"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "התעודה ל� תקפה"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "התעודה �ינה פעילה"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ש� המ�רח בתעודה ל� תו��"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "טביעת ה�צבע של התעודה �ינה תו�מת"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "תעודה בחתימה עצמית"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "שגי�ת תעודה"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "�ין הצפנה זמינה"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "התעודה שגויה"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "החיבור נתקל בסירוב"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "ל� ניתן לקיי� �ת החיבור"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "החיבור נקטע"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "המש�ב כבר מחובר לשרת"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "חשבון זה כבר מחובר לשרת"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש ב�מצעות �ותו המש�ב"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיי� בשרת"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק מכדי לטפל בחיבור"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "התעודה נשללה"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "התעודה משתמשת ב�לגורית� הצפנה בלתי מ�ובטח �ו שהו� חלש מבחינה קריפטוגרפית"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "�ורך �ישור ה�בטחה של השרת �ו עומק מחרוזת �ישור ה�בטחה של השרת חורגי� מהמגבלות שהוצבו על ידי ספריית ההצפנה"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "התכנה שלך ישנה מדי"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "שגי�ה פנימית"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "�נשי� בקרבתי"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "�Yahoo! יפן"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "צ׳�ט Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שנייה"
 msgstr[1] "לפני %d שניות"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "לפני יו�"
 msgstr[1] "לפני %d ימי�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשי�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "בעתיד"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "כל החשבונות"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "חשבון"
 
@@ -737,30 +757,30 @@ msgstr "שרת"
 msgid "Port"
 msgstr "פתחה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ש_� משתמש:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "ה_חלה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_כניסה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "חשבון זה כבר קיי� על השרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "יצירת חשבון חדש על השרת"
 
@@ -769,19 +789,19 @@ msgstr "יצירת חשבון חדש על השרת"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "�%1$s על גבי %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "חשבון %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "חשבון חדש"
 
@@ -1229,213 +1249,219 @@ msgstr "כל הקבצי�"
 msgid "Click to enlarge"
 msgstr "יש ללחוץ כדי להגדיל"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "התחלת השיחה נכשלה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "�יש הקשר המסוי� הזה �ינו תומך בשיחות"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "�יש הקשר המסוי� הזה מנותק"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "�יש הקשר המסוי� הזה �ינו תקני"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�ין תמיכה בשיחות חירו� בפרוטוקול זה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "�ין לך די �שר�י כדי לבצע שיחה זו"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�רע כשל בפתיחת שיחה פרטית"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "�ין תמיכה בשימוש בנוש� בדיון זה"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "�ין לך הרש�ה לשנות �ת הנוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" �ינו מזהה �יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <נוש�>:‎ הגדרת נוש� השיחה הנוכחית"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הו� בררת המחדל"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <זיהוי �יש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳�ט �ישי"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <זיהוי �יש הקשר>‎ <הודעה>:‎ פתיחת צ׳�ט פרטי"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטי� על �יש הקשר"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. �� יש הגדרה ל־<פקודה> יוצג �ופן הפעלתה."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "שימוש: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "פקודה ל� ידועה"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגי�ה בשליחת ההודעה '%s': �%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "שגי�ה בשליחת ההודעה: �%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "לל� יכולת"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "ל� מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "הודעה �רוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ל� ממומש"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "נוש�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנוש� הוגדר ל־: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "הנוש� הוגדר על ידי %s בתור: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "ל� נקבע נוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(�ין הצעות)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "הוספת '%s' למילון"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "הוספת '%s' למילון %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "הכנס סמיילי"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_שלח"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "הצעות _�יות"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�רע כשל בקבלת הדוחות ה�חרוני�"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "�%s התנתק"
@@ -1443,12 +1469,12 @@ msgstr "�%s התנתק"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�%1$s סולק על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s סולק"
@@ -1456,17 +1482,17 @@ msgstr "�%s סולק"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "�%1$s נחס� על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "�%s נחס�"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s עזב �ת החדר"
@@ -1476,17 +1502,17 @@ msgstr "�%s עזב �ת החדר"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "�%s הצטרף לחדר"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "�%s נודע כעת בכינוי %s"
@@ -1494,58 +1520,58 @@ msgstr "�%s נודע כעת בכינוי %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279
+#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "מנותק"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "ה�� ברצונך ל�חסן ססמה זו?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ל� כעת"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ניסיון חוזר"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ססמה שגויה; נ� לנסות שוב:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "חדר זה מוגן בססמה:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "הצטרפות"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "שיחה"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,7 +1616,7 @@ msgstr "�נשי קשר חסומי�"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "הסרה"
@@ -1613,33 +1639,29 @@ msgstr "_פתיחת קישור"
 msgid "%A %B %d %Y"
 msgstr "%A %d ב%B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "מידע �ישי"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�יש קשר חדש"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "ה�� לחסו� �ת %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "ה�� �כן ברצונך לחסו� �ת �פשרות ההתקשרות של '%s' �ליך?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ח_סימה"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1838,6 +1860,16 @@ msgstr "שמירת תמונה �ישית"
 msgid "Unable to save avatar"
 msgstr "ל� ניתן לשמור תמונה �ישית"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "פרטי� �ישיי�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "פרטי �יש קשר"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "ש� מל�"
@@ -1921,11 +1953,6 @@ msgstr "נתוני הלקוח"
 msgid "Client:"
 msgstr "לקוח:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "פרטי �יש קשר"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1946,25 +1973,25 @@ msgstr "מערכת הפעלה:"
 msgid "Version:"
 msgstr "גרסה:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "קבוצות"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "יש לבחור �ת הקבוצות בהן �תה מעוניין ש�יש קשר זה יופיע.  ניתן לבחור ביותר מקבוצה �חת �ו ל� לבחור קבוצות בכלל."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "הוס_פת קבוצה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "בחירה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "קבוצה"
 
@@ -1984,161 +2011,145 @@ msgstr[1] "ל� ניתן לחסו� �ת בעלי הזהות הב�י�:"
 msgid "Edit Contact Information"
 msgstr "עריכת מידע �יש קשר"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "�נשי קשר מקושרי�"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "בחירת �נשי קשר לקישור"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "תצוגה מקדימה של �יש קשר חדש"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "נ� לבחור �ת החשבון לשימוש לצורך ההתקשרות"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "התקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "סלולרי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "עבודה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "בית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "ח_סימת �יש קשר"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_שיחה"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _ויד�ו"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "שליחת קובץ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "שיתוף שולחן העבודה שלי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "מועדף"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "ל� הותקנה התכנית gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "נ� להתקין �ת gnome-contacts כדי לכשת לפרטי �נשי הקשר."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_קישור �נשי קשר…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "מזמין/ה �ותך לחדר זה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "ה_זמנה לחדר שיחה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "הוספת _�יש קשר…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "מחיקה ו_חסימה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ה�� להסיר �ת הקבוצה '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "הקבוצה מוסרת"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "ה_סרה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "להסיר �ת �יש הקשר '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "ה�� �כן ברצונך להסיר �ת �יש הקשר המקושר '%s'? נ� לשי� לב שפעולה זו תסיר �ת כל �נשי הקשר המת�גדי� ל�יש קשר מקושר זה."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "�יש קשר מוסר"
 
@@ -2157,19 +2168,19 @@ msgstr "<b>מיקו�</b> ב(ת�ריך)"
 msgid "Online from a phone or mobile device"
 msgstr "בחיבור סלולרי �ו דרך התקן נייד"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "רשת חדשה"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "בחירת רשת IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_�יפוס רשימת הרשתות"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "בחירה"
@@ -2182,173 +2193,135 @@ msgstr "שרת חדש"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "קישור בין �נשי קשר"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ה_פרדה…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "פיצול �יש הקשר המקושר המוצג ל�נשי הקשר �ות� הו� מכיל."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_קישור"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ה�� לפרק �ת �יש הקשר המקושר '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "ה�� ב�מת ברצונך לפרק �יש קשר מקושר זה? פעולה זו תפריד �ת הקשר המקושר הזה ל�נשי הקשר �ותו הו� מכיל."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_ניתוק"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "הצגה"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "שיחה תחת %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "שיחה ע� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d ב%B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "* %s %s"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "שנייה �חת"
 msgstr[1] "%s שניות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "דקה �חת"
 msgstr[1] "%s דקות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "השיחה �רכה %s, הסתיימה ב־%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "היו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "�תמול"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "ה־%e ב%B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "כל זמן שהו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "כל �חד"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "מי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "מתי"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "כל דבר"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "מלל הצ׳�טי�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "שיחות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "שיחות נכנסות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "שיחות יוצ�ות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "שיחות של� נענו"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "מה"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ה�� �כן ברצונך למחוק �ת כל היומני� של הדיוני� ה�חרוני� שלך?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "מחיקת הכול"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "מחיקה עד מ־:"
 
@@ -2378,7 +2351,7 @@ msgstr "ויד�ו"
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "ע_ריכה"
 
@@ -2435,7 +2408,7 @@ msgid "There was an error starting the conversation"
 msgstr "�ירעה שגי�ה בעת התחלת הדיון"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "יש להזין מזהה ל�יש הקשר �ו מספר טלפון:"
 
@@ -2445,17 +2418,17 @@ msgid "New Conversation"
 msgstr "שיחה חדשה"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "שיֹחת _ויד�ו"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "ֹשיחה _קולית"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "שיחה חדשה"
 
@@ -2511,7 +2484,7 @@ msgstr "הודעות מות�מות �ישית…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "חשבון %s חדש"
@@ -2580,12 +2553,12 @@ msgstr "שיחה קולית הסתיימה"
 msgid "Edit Custom Messages"
 msgstr "עריכת הודעה מות�מת"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "רגיל"
 
@@ -2660,39 +2633,43 @@ msgid "Certificate hostname: %s"
 msgstr "מ�רח �ישור ה�בטחה: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "המשך"
+msgid "C_ontinue"
+msgstr "המ_שך"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "חיבור מפוקפק"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "חיבור זה �ינו מהימן. ה�� ברצונך להמשיך בכל מקרה?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "יש לזכור בחירה זו עבור חיבורי� עתידיי�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "פרטי התעודה"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "ל� ניתן לפתוח �ת הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "בחירת קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�ין די מקו� פנוי לשמירת הקובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "נדרשי� %s של מקו� פנוי כדי לשמור קובץ זה, �ך ישנ� רק %s פנויי�. נ� לבחור במיקו� �חר."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "קובץ נכנס מ־%s"
@@ -2872,23 +2849,23 @@ msgstr "�ין הודעת שגי�ה"
 msgid "Instant Message (Empathy)"
 msgstr "הודעה מיידית (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "ל� להתחבר בהפעלה"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�ין להציג �ת רשימת �נשי הקשר �ו כל דו־שיח �חר בהפעלה"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- לקוח המסרי� המידיי� Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "שגי�ה ביצירת קשר ע� מנהל החשבונות"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2924,203 +2901,77 @@ msgstr ""
 "פרוייקט תרגו� GNOME לעברית:\n"
 "�http://gnome-il.berlios.de"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "�רעה שגי�ה בזמן יבו� החשבונות."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "�רעה שגי�ה בעת ניתוח נתוני החשבון."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "�רעה שגי�ה במהלך יצירת החשבון."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "�רעה שגי�ה."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "הודעת השגי�ה הייתה: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "ניתן לחזור �חורה ולנסות להקליד �ת פרטי החשבון שוב �ו לצ�ת ממסייע זה ולהוסיף חשבונות מ�וחר יותר מתפריט העריכה."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "התרחשה שגי�ה."
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "�ילו חשבונות יש לך?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ה�� יש לך חשבונות נוספי� שברצונך להגדיר?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "נ� להזין �ת פרטי החשבון שלך"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "�יזה חשבון שיחות ברצונך ליצור?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "ה�� ברצונך ליצור חשבונות שיחה �חרי�?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "נ� להזין �ת הפרטי� עבור החשבון החדש"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "בעזרת Empathy ניתן לשוחח ע� �נשי� קרובי� המחוברי� לרשת וע� חברי� ועמיתי� לעבודה המשתמשי� ב־Google Talk, �AIM,� Windows Live ועוד תוכנות דומות רבות. בעזרת המיקרופון ומצלמת הרשת שלך ניתן ג� לנהל שיחות קול וויד�ו."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "יש לך חשבון שהשתמשת בו ע� תוכנת שיחה �חרת?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "כן, נ� לייב� �ת פרטי החשבון מ־"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "כן, �ני �זין �ת פרטי החשבון עכשיו"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "ל�, �ני רוצה חשבון חדש"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "ל�, �ני רק רוצה לר�ות �נשי� המחוברי� בקרבת מקו� לעת עתה"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "נ� לבחור �ת החשבון שברצונך לייב�:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "כן"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "ל�, זה הכול לעכשיו"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "ב�פשרות Empathy לגלות ולנהל שיחות ע� �נשי� המחוברי� ל�ותה הרשת כמוך. �� ברצונך להשתמש בתכונה זו, נ� לבדוק שהפרטי� שלהלן נכוני�. ניתן לשנות פרטי� �לה בקלות מ�וחר יותר �ו לבטל תכונה זו ב�מצעות הדו־שיח 'חשבונות'"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "עריכה->חשבונות"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "�ין לי _כל עניין ל�פשר �ת התכונה הזו כעת"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "ל� ניתן יהיה לשוחח ע� �נשי� המחוברי� לרשת המקומית שלך כיוון ש־telepathy-salut �ינה מותקנת, �� ברצונך להפעיל תכונה זו עליך להתקין �ת החבילה telepathy-salut וליצור חשבון ב'�נשי� בקרבתי' מדו־שיח החשבונות"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut �ינה מותקנת"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "ברוך בו�ך �ל Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "ייבו� חשבונות קיימי�"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "נ� להזין פרטי� �ישיי�"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ישנ� שינויי� של� נשמרו בחשבון ה־%s שלך."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "החשבון החדש שלך ל� נשמר עדיין."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "בהתחברות…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "ל� מחובר — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "מנותק  — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "מנותק — �ין חיבור לרשת"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "מצב ל� ידוע"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "חשבון זה נוטרל כיוון שהו� נשען על מנגנון ישן ש�ינו נתמך עוד. נ� להתקין �ת telepathy-haze ולצ�ת ולהיכנס לחשבון המשתמש שלך כדי לייב� �ת החשבון."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "מנותק — החשבון מנוטרל"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "עריכת הגדרות החיבור"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "�ירע כשל בקבלת הפרטי� ה�ישיי� שלך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "עליך להתחבר כדי לערוך �ת הפרטי� ה�ישיי� שלך."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "ע_ריכת הגדרות החיבור..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ה�� ברצונך להסיר �ת החשבון '%s' ממחשבך?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "פעולה זו ל� תסיר �ת חשבונך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3129,15 +2980,23 @@ msgstr ""
 "�ת השינויי� שלך. ה�ת �תה בטוח שברצונך להמשיך?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "ה_פעלה"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "נ_טרול"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_דילוג"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "הת_חברות"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3154,18 +3013,14 @@ msgid "Loading account information"
 msgstr "פרטי �יש הקשר נטעני�"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�ין פרוטוקולי� מותקני�"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "פרוטוקול:"
+msgid "No protocol backends installed"
+msgstr "�ין מנגנוני פרוטוקולי� מותקני�"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "י_בו�…"
 
@@ -3177,17 +3032,13 @@ msgstr "- לקוח ה�ימות של Empathy"
 msgid "Empathy authentication client"
 msgstr "לקוח ה�ימות של Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "�נשי� בקרבתי"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- לקוח השמע/הוויד�ו Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "לקוח השמע/הוויד�ו Empathy"
 
@@ -3230,111 +3081,111 @@ msgstr "פרטי�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה ע� %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי המחשב"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי שרת ב�ינטרנט"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "כתובת ה־IP כדי שנר�ית על ידי עמית מהצד השני"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "כתובת ה־IP של קבוצת התשדורת"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "ֹל� ידוע"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02d דק׳"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "פרטי� טכניי�"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "התכנה של %s �ינה מבינה �ת מבני השמע הנתמכי� על ידי המחשב שלך"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "התכנה של %s �ינה מבינה �ת מבני הוויד�ו הנתמכי� על ידי המחשב שלך"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "ל� ניתן להפעיל �ת החיבור �ל %s. כנר�ה �חד ממשתתפי השיחה מחובר לרשת ש�ינה מ�פשרת חיבורי� ישירי�."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "�ירעה שגי�ה ברשת"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הוויד�ו הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "משהו בלתי צפוי �רע ברכיב של Telepathy. נ� <a href=\"%s\">לדווח על ב�ג זה</a> ולהוסיף דוחות שנ�ספו מחלון 'ניפוי השגי�ות' שבתפריט העזרה."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "�ירעה שגי�ה במנוע הקרי�ה"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "התזרי� הגיע לסיומו"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "ל� ניתן לקיי� תזרי� שמע"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "ל� ניתן לקיי� תזרי� ויד�ו"
 
@@ -3426,10 +3277,10 @@ msgstr "החלפת מצב העברת ויד�ו"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "ל� ידוע"
 
@@ -3448,18 +3299,18 @@ msgstr "מ_צלמה"
 
 #: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_תכני�"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_ניפוי שגי�ות"
 
 #: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "ע_זרה"
 
@@ -3472,52 +3323,85 @@ msgid "_Settings"
 msgstr "ה_גדרות"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "ה�� לסגור חלון זה?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "סגירת חלון זה תגרו� לעזיבת %s. ל� יתקבלו עוד הודעות על להצטרפותך �ליו מחדש."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "סגירת חלון זה תוביל לעזיבת חדר הצ׳�ט. ל� יתקבלו עוד הודעות עד להתחברותך מחדש �ליו."
+msgstr[1] "סגירת חלון זה תוביל לעזיבת %u חדרי הצ׳�ט. ל� יתקבלו עוד הודעות עד להתחברותך מחדש �ליה�."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "ה�� לעזוב �ת %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "ל� יתקבלו עוד הודעות מחדר צ׳�ט זה עד להצטרפותך המחודשת �ליו."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "סגירת החלון"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "עזיבת החדר"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "�%s (�חת של� נקר�ה)"
 msgstr[1] "�%s �(%d של� נקר�ו)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "�%s (ו�חד נוסף)"
 msgstr[1] "�%s (ו־%u נוספי�)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "�%s (�חת של� נקר�ה מ�חרי�)"
 msgstr[1] "�%s (%d של� נקר�ו מ�חרי�)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "�%s (�חת של� נקר�ה מכול�)"
 msgstr[1] "�%s (%d של� נקר�ו מכול�)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "נשלחת הודעה �חת"
 msgstr[1] "נשלחות %d הודעות"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "הודעה מוקלדת."
 
@@ -3598,102 +3482,102 @@ msgstr "חיבור �וטומטי"
 msgid "Manage Favorite Rooms"
 msgstr "ניהול חדרי שיחה מועדפי�"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "שיחה קולית נכנסת"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "�%s מתקשר �ליך ע� ויד�ו, ה�� ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "�%s מתקשר �ליך, ה�� ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "שיחה נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_דחייה"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_מענה"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "מ_ענה ע� ויד�ו"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "שיחת ויד�ו נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "הזמנה לחדר"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "הזמנה להצטרף ל־%s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "�%s מזמין/ה �ותך להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_סירוב"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ה_צטרפות"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "�%s הזמין/ה �ותך להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "הוזמנת להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "העברת קבצי� נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "נדרשת ססמה"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s רוצה הרש�ות לצפייה מתי המשתמש שלך מחובר"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3816,172 +3700,190 @@ msgstr "העברות קבצי�"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "הסרת העברות קבצי� שהושלמו, בוטלו �ו נכשלו מהרשימה"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "י_בו�"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "ל� נמצ�ו חשבונות לייבו�. Empathy תומך כרגע בייבו� חשבונות מ־Pidgin בלבד."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "יבו� חשבונות"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "יבו�"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "הזנת ססמה"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ניתוק"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "עליך להגדיר חשבון כדי שיופיעו כ�ן �נשי קשר."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "ל� נמצ�ה הת�מה"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "ל� ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "עדכון התכנה..."
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "סגירה"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "התחברות מחדש"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Top up %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "�שר�י חשבון ה־Top up"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Top Up..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "�יש קשר"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "עליך להפעיל �ת �חד החשבונות שלך כדי שיופיעו כ�ן �נשי קשר."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "עליך להפעיל �ת %s כדי שיופיעו כ�ן �נשי קשר."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "רשימת �נשי קשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "הגדרות החשבון"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�נשי קשר על ה_מפה"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "מ�זן ה�שר�י"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_חיפוש ברשימת �נשי הקשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_צירוף למועדפי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ניהול מועדפי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "גודל _רגיל"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
+#: ../src/empathy-roster-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "גודל רגיל ע� _תמונות �ישיות"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "העד_פות"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "הצגת פ_רוטוקולי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "מיון לפי _ש�"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "מיון לפי _מצב"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_חשבונות"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "�נשי קשר _חסומי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "גודל _קומפקטי"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "העברות _קבצי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "ה_צטרפות…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "�נשי קשר _ל� מחוברי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "מידע _�ישי"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_חדר"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_חיפוש �חר �נשי קשר…"
 
@@ -3995,7 +3897,7 @@ msgstr "חברי�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4008,16 +3910,21 @@ msgstr ""
 "נדרשת ססמה: %s\n"
 "חברי�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "כן"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ל�"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ל� ניתן להתחיל �ת הצגת החדרי�"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ל� ניתן לעצור �ת הצגת החדרי�"
 
@@ -4058,8 +3965,8 @@ msgid "New conversation"
 msgstr "שיחה חדשה"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "�יש קשר מתחבר"
+msgid "Contact comes online"
+msgstr "�יש הקשר מתחבר"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
@@ -4078,46 +3985,46 @@ msgid "Language"
 msgstr "שפה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "יוליה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "רומי�ו"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "הו רומי�ו, רומי�ו, מן �ין שבת רומי�ו?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "התכחש ל�ביך וסרב לשמו;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "�ו �� ל� תסכי�, �שבע לך ב�הבתי"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ול� �היה עוד בת קפולט."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ה�� דיברתי די �ו שמ� �וסיף לדבר?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "יוליה התנתקה"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -4210,49 +4117,49 @@ msgid "Spell Checking"
 msgstr "בדיקת �יות"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "הפעלת צ׳�טי� ב־:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "ברשימת השפות מוצגות שפות שעבורן מותקני� �צלך מילוני�."
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "ערכות נוש�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "שימוש ב_ביטול הד כדי לשפר �ת �יכות השיחה"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "הגוון:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "התחברות _�וטומטית ע� ההפעלה"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "טלפון _סלולרי"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "ה_פעלת התרעות בתוך בועה"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "ה_פעלת התרעות קוליות"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_רשת (IP, �לחוטית)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_פתיחת שיחות חדשות בחלונות נפרדי�"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
@@ -4262,6 +4169,14 @@ msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
 msgid "_Reduce location accuracy"
 msgstr "ה_פחתת דיוק המיקו�"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "_חלונות חדשי�"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_לשוניות חדשות"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "מצב"
@@ -4322,64 +4237,85 @@ msgstr "תצוגה מקדימה לוויד�ו"
 msgid "Contact Map View"
 msgstr "מפת �נשי קשר"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "קישור ל־Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "תגובה מ־Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "הנתוני� גדולי� מדי להדבקה �חת. נ� לשמור �ת היומני� לקובץ."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "חלון ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "שליחה ל־Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "�זהרה"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "שגי�ה"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "תחו�"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "מנהל החיבורי� שנבחר �ינו תומך בהרחבת ניפוי שגי�ות מרחוק."
 
@@ -4396,31 +4332,27 @@ msgstr "נ� לבחור �נשי קשר להזמנה לדיון:"
 msgid "Invite"
 msgstr "הזמנה"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו�) ול�חריה התכנית תסגר"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�ין להציג תיבות דו־שיח כלשהן �ל� �� כן ישנן חשבונות \"�נשי� בקרבתי\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "הצגת מסייע החשבונות"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- חשבונות Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "חשבונות Empathy"
 
@@ -4436,86 +4368,86 @@ msgstr "- מנפה השגי�ות של Empathy"
 msgid "Empathy Debugger"
 msgstr "מנפה השגי�ות של Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- לקוח הצ׳�טי� Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "תגובה"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "דחייה"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "מענה"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "מענה ע� ויד�ו"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "סירוב"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "�ישור"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "×”×–× ×”"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "התקבלה בקשת שיחה מ�ת %s, �ך ב�ותו הזמן כבר היית בשיחה �חרת."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "המ�זן הנוכחי שלך הו� %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�ין לך מספיק �שר�י כדי לבצע שיחה זו."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Top Up"
 
@@ -4523,10 +4455,184 @@ msgstr "Top Up"
 msgid "_Match case"
 msgstr "הת�מת _רישיות"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "�ילו חשבונות יש לך?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "נוסף חשבון חדש"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "�נשי� בקרבתי"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "ב�פשרות Empathy לגלות ולנהל שיחות ע� �נשי� המחוברי� ל�ותה הרשת כמוך. �� ברצונך להשתמש בתכונה זו, נ� לבדוק שהפרטי� שלהלן נכוני�."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "ב�פשרותך לשנות פרטי� �לה מ�וחר יותר �ו לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה � חשבונות</span> ברשימת �נשי הקשר."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "�נשי קשר מקושרי�"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "בחירת �נשי קשר לקישור"
+
+#~ msgid "New contact preview"
+#~ msgstr "תצוגה מקדימה של �יש קשר חדש"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_קישור �נשי קשר…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "קישור בין �נשי קשר"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "ה_פרדה…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "פיצול �יש הקשר המקושר המוצג ל�נשי הקשר �ות� הו� מכיל."
+
+#~ msgid "_Link"
+#~ msgstr "_קישור"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ה�� לפרק �ת �יש הקשר המקושר '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ה�� ב�מת ברצונך לפרק �יש קשר מקושר זה? פעולה זו תפריד �ת הקשר המקושר הזה "
+#~ "ל�נשי הקשר �ותו הו� מכיל."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_ניתוק"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "�רעה שגי�ה בזמן יבו� החשבונות."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "�רעה שגי�ה בעת ניתוח נתוני החשבון."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "�רעה שגי�ה במהלך יצירת החשבון."
+
+#~ msgid "There was an error."
+#~ msgstr "�רעה שגי�ה."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "הודעת השגי�ה הייתה: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "ניתן לחזור �חורה ולנסות להקליד �ת פרטי החשבון שוב �ו לצ�ת ממסייע זה "
+#~ "ולהוסיף חשבונות מ�וחר יותר מתפריט העריכה."
+
+#~ msgid "An error occurred"
+#~ msgstr "התרחשה שגי�ה."
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ה�� יש לך חשבונות נוספי� שברצונך להגדיר?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "נ� להזין �ת פרטי החשבון שלך"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "�יזה חשבון שיחות ברצונך ליצור?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "ה�� ברצונך ליצור חשבונות שיחה �חרי�?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "נ� להזין �ת הפרטי� עבור החשבון החדש"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "בעזרת Empathy ניתן לשוחח ע� �נשי� קרובי� המחוברי� לרשת וע� חברי� ועמיתי� "
+#~ "לעבודה המשתמשי� ב־Google Talk, �AIM,� Windows Live ועוד תוכנות דומות רבות. "
+#~ "בעזרת המיקרופון ומצלמת הרשת שלך ניתן ג� לנהל שיחות קול וויד�ו."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "יש לך חשבון שהשתמשת בו ע� תוכנת שיחה �חרת?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "כן, נ� לייב� �ת פרטי החשבון מ־"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "כן, �ני �זין �ת פרטי החשבון עכשיו"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ל�, �ני רוצה חשבון חדש"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ל�, �ני רק רוצה לר�ות �נשי� המחוברי� בקרבת מקו� לעת עתה"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "נ� לבחור �ת החשבון שברצונך לייב�:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ל�, זה הכול לעכשיו"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "עריכה->חשבונות"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "�ין לי _כל עניין ל�פשר �ת התכונה הזו כעת"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ל� ניתן יהיה לשוחח ע� �נשי� המחוברי� לרשת המקומית שלך כיוון ש־telepathy-"
+#~ "salut �ינה מותקנת, �� ברצונך להפעיל תכונה זו עליך להתקין �ת החבילה "
+#~ "telepathy-salut וליצור חשבון ב'�נשי� בקרבתי' מדו־שיח החשבונות"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "ברוך בו�ך �ל Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ייבו� חשבונות קיימי�"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "נ� להזין פרטי� �ישיי�"
+
+#~ msgid "Protocol:"
+#~ msgstr "פרוטוקול:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "הצגת מסייע החשבונות"
+
+#~ msgid "Personal Information"
+#~ msgstr "מידע �ישי"
+
+#~ msgid "_Personal Information"
+#~ msgstr "מידע _�ישי"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_פתיחת שיחות חדשות בחלונות נפרדי�"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "החשבונות המקווני� שלי"
 
@@ -5025,9 +5131,6 @@ msgstr "נוסף חשבון חדש"
 #~ msgid "Unknown error code"
 #~ msgstr "מספר שגי�ה ל� ידוע"
 
-#~ msgid "msn account settings"
-#~ msgstr "הגדרות חשבון msn"
-
 #~ msgid "salut account settings"
 #~ msgstr "הגדרות חשבון salut"
 
diff --git a/po/hu.po b/po/hu.po
index b9e36f165..8fc11c8db 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,502 +7,566 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 20:14+0200\n"
-"PO-Revision-Date: 2012-01-09 12:41+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-03-07 10:18+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
-"Language: \n"
+"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: \n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Csevegés Google Talk, Facebook, MSN és sok más szolgáltatáson"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Üzenetküldő-kliens"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy üzenetküldő"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Üzenetküldő-kliens"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Csevegés Google Talk, Facebook, MSN és sok más szolgáltatáson"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Üzenetküldő- és VoIP-fiókok"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Üzenetküldő- és VoIP-fiókok kezelése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Mindig külön ablakot nyisson az új csevegéseknek."
+msgid "Connection managers should be used"
+msgstr "Használandó kapcsolatkezelők"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Hívás hangereje"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Hívás hangereje százalékban."
+msgid "Empathy should auto-connect on startup"
+msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kameraeszköz"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kamerapozíció"
+msgid "Empathy should auto-away when idle"
+msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
-"csoportos csevegésben."
+"Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Csevegőablak témája"
+msgid "Empathy default download folder"
+msgstr "Az Empathy alapértelmezett letöltési mappája"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Csevegőablak témájának változata"
+msgid "The default folder to save file transfers in."
+msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
-"listája (például: „en, fr, hu�)."
+msgid "Show offline contacts"
+msgstr "Kilépett partnerek megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Tömör partnerlista"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Kilépett partnerek megjelenítése a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Használandó kapcsolatkezelők"
+msgid "Show avatars"
+msgstr "Avatarok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Partnerlista rendezési feltétele"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
+"csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"A videohívásokban használandó alapértelmezett kameraeszköz, például /dev/"
-"video0."
+msgid "Show protocols"
+msgstr "Protokollok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
+"csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Felugró értesítések tiltása ha nincs itt"
+msgid "Show Balance in contact list"
+msgstr "Egyenleg megjelenítése a partnerlistában"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Hangok tiltása ha nincs itt"
+msgid "Whether to show account balances in the contact list."
+msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Bejövő események megjelenítése az állapotterületen"
+msgid "Compact contact list"
+msgstr "Tömör partnerlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
-"megjeleníti ezeket a felhasználónak."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Megjelenjen-e a partnerlista tömör módban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Visszhang-csillapítás támogatása"
+msgid "Hide main window"
+msgstr "Főablak elrejtése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Az Empathy közzéteheti a felhasználó helyét"
+msgid "Hide the main window."
+msgstr "A főablak elrejtése."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
+msgid "Default directory to select an avatar image from"
+msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
+msgid "Open new chats in separate windows"
+msgstr "Új csevegések megnyitása külön ablakokban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Az Empathy alapértelmezett letöltési mappája"
+msgid "Always open a separate chat window for new chats."
+msgstr "Mindig külön ablakot nyisson az új csevegéseknek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Az Empathy átköltöztette az MSN-naplókat"
+msgid "Display incoming events in the status area"
+msgstr "Bejövő események megjelenítése az állapotterületen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
+"megjeleníti ezeket a felhasználónak."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
+msgid "The position for the chat window side pane"
+msgstr "A csevegőablak oldalsávjának pozíciója"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Az Empathy csökkentse-e a hely pontosságát?"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "Partnercsoportok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit fejlesztőeszközök engedélyezése"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "Megjelenjenek-e a csoportok a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Felugró értesítések engedélyezése új üzenetekre"
+msgid "Contact list sort criterion"
+msgstr "Partnerlista rendezési feltétele"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Helyesírás-ellenőrző engedélyezése"
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"A partnerlista rendezéséhez használandó feltétel A lehetséges értékek: "
+"„name� (név szerint) és „state� (állapot szerint, ez az alapértelmezett)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Főablak elrejtése"
+msgid "Use notification sounds"
+msgstr "Értesítő hangok használata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "A főablak elrejtése."
+msgid "Whether to play a sound to notify of events."
+msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Kiegészített becenevet jelző karakter"
+msgid "Disable sounds when away"
+msgstr "Hangok tiltása ha nincs itt"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Új csevegések megnyitása külön ablakokban"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "A használandó Adium téma útvonala"
+msgid "Play a sound for incoming messages"
+msgstr "Hang lejátszása érkező üzenetekhez"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Hang lejátszása érkező üzenetekhez"
+msgid "Play a sound for outgoing messages"
+msgstr "Hang lejátszása kimenő üzenetekhez"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Hang lejátszása új társalgásokhoz"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "Hang lejátszása kimenő üzenetekhez"
+msgid "Play a sound for new conversations"
+msgstr "Hang lejátszása új társalgásokhoz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Hang lejátszása partner bejelentkezésekor"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Hang lejátszása partner kijelentkezésekor"
+msgid "Play a sound when a contact logs in"
+msgstr "Hang lejátszása partner bejelentkezésekor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Hang lejátszása bejelentkezéskor"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Hang lejátszása kijelentkezéskor"
+msgid "Play a sound when a contact logs out"
+msgstr "Hang lejátszása partner kijelentkezésekor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
+"hálózatból?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
+msgid "Play a sound when we log in"
+msgstr "Hang lejátszása bejelentkezéskor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "A kamera-előnézet helye a hívás során."
+msgid "Play a sound when we log out"
+msgstr "Hang lejátszása kijelentkezéskor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Egyenleg megjelenítése a partnerlistában"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Avatarok megjelenítése"
+msgid "Enable popup notifications for new messages"
+msgstr "Felugró értesítések engedélyezése új üzenetekre"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Partnerlista megjelenítése szobákban"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Tanács megjelenítése a főablak bezárásakor"
+msgid "Disable popup notifications when away"
+msgstr "Felugró értesítések tiltása ha nincs itt"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Kilépett partnerek megjelenítése"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Protokollok megjelenítése"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Helyesírás-ellenőrző nyelvei"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
+"csevegés meg van nyitva, de nincs fókuszban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
+"válik."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "A csevegőablak oldalsávjának pozíciója"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
+msgid "Use graphical smileys"
+msgstr "Grafikus hangulatjelek használata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Hangulatjelek képekké alakítása társalgások közben."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Grafikus hangulatjelek használata"
+msgid "Show contact list in rooms"
+msgstr "Partnerlista megjelenítése szobákban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Értesítő hangok használata"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Téma használata a csevegőszobákhoz"
+msgid "Chat window theme"
+msgstr "Csevegőablak témája"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
+msgid "Chat window theme variant"
+msgstr "Csevegőablak témájának változata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
+msgid "Path of the Adium theme to use"
+msgstr "A használandó Adium téma útvonala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Az Empathy átköltöztette-e az MSN naplókat."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit fejlesztőeszközök engedélyezése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
+msgid "Inform other users when you are typing to them"
+msgstr "Felhasználók értesítése arról, hogy gépel nekik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"A „gépelés� vagy „szünet� csevegésállapotok küldése. Jelenleg nem "
+"befolyásolja a „távol� állapotot."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
+msgid "Use theme for chat rooms"
+msgstr "Téma használata a csevegőszobákhoz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Használandó-e téma a csevegőszobákhoz."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
+msgid "Spell checking languages"
+msgstr "Helyesírás-ellenőrző nyelvei"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Hangulatjelek képekké alakítása társalgások közben."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
+"listája (például: „en, fr, hu�)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Engedélyezendő-e a Pulseaudio visszhang-csillapítási szűrője."
+msgid "Enable spell checker"
+msgstr "Helyesírás-ellenőrző engedélyezése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
-"hálózatból?"
+msgid "Nick completed character"
+msgstr "Kiegészített becenevet jelző karakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
+"csoportos csevegésben."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
+msgid "Last account selected in Join Room dialog"
+msgstr "A csatlakozás szobához ablakban utoljára kiválasztott fiók"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"A szobához csatlakozáshoz utoljára kiválasztott fiók D-Bus objektumútvonala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
+msgid "Camera device"
+msgstr "Kameraeszköz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"A videohívásokban használandó alapértelmezett kameraeszköz, például /dev/"
+"video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
+msgid "Camera position"
+msgstr "Kamerapozíció"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
-"válik."
+msgid "Position the camera preview should be during a call."
+msgstr "A kamera-előnézet helye a hívás során."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
-"csevegés meg van nyitva, de nincs fókuszban."
+msgid "Echo cancellation support"
+msgstr "Visszhang-csillapítás támogatása"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Engedélyezendő-e a Pulseaudio visszhang-csillapítási szűrője."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
+msgid "Show hint about closing the main window"
+msgstr "Tanács megjelenítése a főablak bezárásakor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
-"csevegőablakokban."
+"Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Kilépett partnerek megjelenítése a partnerlistában."
+msgid "Empathy can publish the user's location"
+msgstr "Az Empathy közzéteheti a felhasználó helyét"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
-"csevegőablakokban."
+msgid "Empathy can use the network to guess the location"
+msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Megjelenjen-e a partnerlista tömör módban."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Használandó-e téma a csevegőszobákhoz."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Az Empathy csökkentse-e a hely pontosságát?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"A partnerlista rendezéséhez használandó feltétel. A lehetséges értékek: "
-"„name� (név szerint, ez az alapértelmezett) és „state� (állapot szerint)."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Üzenetküldő- és VoIP-fiókok kezelése"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Nincs megadva ok"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Üzenetküldő- és VoIP-fiókok"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "�llapotváltozás kérve"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Megszakította a fájlátvitelt"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "A partner megszakította a fájlátvitelt"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Hiba a fájl átvitelekor"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "A partner nem képes a fájl átvitelére"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Ismeretlen ok"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "A fájlátvitel befejeződött, de a fájl megsérült"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "A távoli partner nem támogatja a fájlátvitelt"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "A kiválasztott fájl nem szabályos fájl"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "A kiválasztott fájl üres"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nem fogadott hívás ettől: %s"
@@ -518,168 +582,141 @@ msgstr "Felhívva: %s"
 msgid "Call from %s"
 msgstr "Hívás tőle: %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "A foglalattípus nem támogatott"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nincs megadva ok"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "�llapotváltozás kérve"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Megszakította a fájlátvitelt"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "A partner megszakította a fájlátvitelt"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Hiba a fájl átvitelekor"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "A partner nem képes a fájl átvitelére"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Ismeretlen ok"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Távol"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Kilépett"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nincs megadva ok"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Az állapot beállítva kilépettre"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "A hitelesítés meghiúsult"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Titkosítási hiba"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "A név használatban"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nincs megadva tanúsítvány"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "A tanúsítvány nem megbízható"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "A tanúsítvány lejárt"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "A tanúsítvány nincs aktiválva"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "A tanúsítvány gépneve eltér"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A tanúsítvány ujjlenyomata eltér"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "A tanúsítvány önaláírt"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Tanúsítványhiba"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "A titkosítás nem érhető el"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "A tanúsítvány érvénytelen"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "A kapcsolat visszautasítva"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "A kapcsolat nem hozható létre"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "A kapcsolat elveszett"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ez az erőforrás már kapcsolódik a kiszolgálóhoz"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Ez a fiók már kapcsolódik a kiszolgálóhoz"
 
-#: ../libempathy/empathy-utils.c:356
-msgid "Connection has been replaced by a new connection using the same resource"
-msgstr "A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
+#: ../libempathy/empathy-utils.c:357
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "A fiók már létezik a kiszolgálón"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "A kiszolgáló pillanatnyilag túl elfoglalt a kapcsolat kezeléséhez"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "A tanúsítvány visszavonva"
 
-#: ../libempathy/empathy-utils.c:365
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "A tanúsítvány nem biztonságos titkosító algoritmust használ, vagy "
 "titkosításilag gyenge"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -687,283 +724,263 @@ msgstr ""
 "A kiszolgáló tanúsítványának hossza, vagy a kiszolgáló tanúsítványláncának "
 "mélysége túllépi a titkosítási programkönyvtár korlátozásait"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "A szoftver túl régi"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "Belső hiba"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Közeli emberek"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook csevegés"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d másodperce"
 msgstr[1] "%d másodperce"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d perce"
 msgstr[1] "%d perce"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d órája"
 msgstr[1] "%d órája"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d napja"
 msgstr[1] "%d napja"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d hete"
 msgstr[1] "%d hete"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d hónapja"
 msgstr[1] "%d hónapja"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "a jövőben"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Minden fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Webes fiókjaim"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "A(z) %s fiók szerkesztésre kerül a(z) %s használatával."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "A webes fiókjaim elindítása"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "%s szerkesztése"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Alkalmazás"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Bejele_ntkezés"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ez a fiók már létezik a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Új fiók létrehozása a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Mé_gse"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ezen: %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Új fiók"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Például:</b> Sajátnevem"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Jelszó:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Speciális"
+msgid "Screen _Name:"
+msgstr "Megjelenő _név:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Például:</b> Sajátnevem"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Jelszó:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Jelszó megjegyzése"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Jelszó megjegyzése"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Jelszó megjegyzése"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Megjelenő _név:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Kiszolgáló:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Mi az Ön AIM jelszava?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Speciális"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Mi az Ön AIM neve?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Mi az Ön AIM jelszava?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Kiszolgáló:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Például:</b> felhasználónév"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Jelszó megjegyzése"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Bejelentkezési a_zonosító:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Például:</b> felhasználónév"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Mi az Ön GroupWise felhasználói azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Mi az Ön GroupWise jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Például:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Karakterkészlet:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Mi az Ön ICQ UIN-ja?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Mi az Ön ICQ jelszava?"
 
@@ -1000,11 +1017,23 @@ msgstr "Beállítások"
 msgid "None"
 msgstr "Nincs"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Hálózat"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Hálózat:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Karakterkészlet:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Kiszolgálók"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1012,14 +1041,6 @@ msgstr ""
 "A legtöbb IRC-kiszolgáló nem kér jelszót, ha bizonytalan, akkor ne írjon be "
 "jelszót."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Hálózat"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Hálózat:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Becenév:"
@@ -1036,48 +1057,20 @@ msgstr "Kilépési üzenet:"
 msgid "Real name:"
 msgstr "Valódi név:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Kiszolgálók"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Mi az Ön IRC beceneve?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Melyik IRC-hálózat?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Például:</b> felhasznalo@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Például:</b> felhasznalo@jabber.hu"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Titkosítás szükséges (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL-tanúsítvány_hibák figyelmen kívül hagyása"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Kiszolgáló beállításainak felülbírálása"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Prioritás:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Mi az Ön IRC beceneve?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Erőforrás:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Mi az Ön Facebook felhasználóneve?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1090,179 +1083,203 @@ msgstr ""
 "Ha még nincs Facebook felhasználóneve, <a href=\"http://www.facebook.com/"
 "username/\">ezen az oldalon</a> választhat."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Régi SS_L használata"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Mi az Ön Facebook jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Mi az Ön Facebook felhasználóneve?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Mi az Ön Google azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Például:</b> felhasznalo@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Mi az Ön Google jelszava?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Például:</b> felhasznalo@jabber.hu"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL-tanúsítvány_hibák figyelmen kívül hagyása"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritás:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Erőforrás:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Titkosítás szükséges (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Régi SS_L használata"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Kiszolgáló beállításainak felülbírálása"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Mi az Ön Jabber azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Mi az Ön Jabber jelszava?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Adja meg a kívánt Jabber azonosítót"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Mi az Ön Jabber jelszava?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Adja meg a kívánt Jabber jelszót"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Például:</b> felhasznalo@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Mi az Ön Windows Live azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Mi az Ön Windows Live jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_E-mail cím:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Be_cenév:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Vezetéknév:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Utónév:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Közzétett név:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber azonosító:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Vezetéknév:"
+msgid "E-_mail address:"
+msgstr "_E-mail cím:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Közzétett név:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Például:</b> felhasznalo@sajat.sip.kiszolgalo"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Hitelesítési felhasználónév:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Kapcsolat feltérképezése"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "A STUN-kiszolgáló automatikus feltérképezése"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Ezen fiók használata _vezetékes és mobil telefonok hívására"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS-hibák figyelmen kívül hagyása"
+msgid "NAT Traversal Options"
+msgstr "NAT-bejárás beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Időköz (másodperc)"
+msgid "Proxy Options"
+msgstr "Proxy beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Kapcsolatfenntartás beállításai"
+msgid "Miscellaneous Options"
+msgstr "Egyéb beállítások"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Laza útválasztás"
+msgid "STUN Server:"
+msgstr "STUN kiszolgáló:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanizmus:"
+msgid "Discover the STUN server automatically"
+msgstr "A STUN-kiszolgáló automatikus feltérképezése"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Egyéb beállítások"
+msgid "Discover Binding"
+msgstr "Kapcsolat feltérképezése"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT-bejárás beállításai"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Kiszolgáló:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Kapcsolatfenntartás beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanizmus:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy beállításai"
+msgid "Interval (seconds)"
+msgstr "Időköz (másodperc)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Hitelesítési felhasználónév:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Szállítás:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN kiszolgáló:"
+msgid "Loose Routing"
+msgstr "Laza útválasztás"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Kiszolgáló:"
+msgid "Ignore TLS Errors"
+msgstr "TLS-hibák figyelmen kívül hagyása"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Szállítás:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Ezen fiók használata _vezetékes és mobil telefonok hívására"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Mi az Ön SIP fiókjának jelszava?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mi az Ön SIP felhasználói azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Felhasználónév:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Mi az Ön SIP fiókjának jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! a_zonosító:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások _figyelmen kívül hagyása"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Sz_obalista területi beállítása:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Mi az Ön Yahoo! azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Mi az Ön Yahoo! jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! a_zonosító:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Sz_obalista területi beállítása:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1300,61 +1317,65 @@ msgstr "Minden fájl"
 msgid "Click to enlarge"
 msgstr "Kattintson ide a nagyításhoz"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Hiba történt a hívás indításakor"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "A megadott partner nem támogatja a hívásokat"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "A kiválasztott partner kilépett"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "A kiválasztott partner nem érvényes"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "A vészhívások nem támogatottak ezzel a protokollal"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Nincs elég kreditje a hívás végrehajtásához"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Nem sikerült privát csevegést nyitni"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "A téma nem támogatott ebben a csevegésben"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "A téma megváltoztatása nem engedélyezett"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "A(z) „%s� nem érvényes partnerazonosító"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: az aktuális társalgás összes üzenetének törlése"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: az aktuális társalgás témájának beállítása"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1362,23 +1383,23 @@ msgstr ""
 "/part [<csevegőszoba-azonosító>] [<ok>]: csevegőszoba elhagyása, "
 "alapértelmezés a jelenlegi"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <partnerazonosító> [<üzenet>]: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <partnerazonosító> <üzenet>: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <becenév>: becenév módosítása a jelenlegi kiszolgálón"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <üzenet>: tevékenység üzenet küldése az aktuális társalgásba"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1388,11 +1409,11 @@ msgstr ""
 "jellel kezdődő üzenetek küldésére használatos. Például: „/say /join "
 "#csevegőszoba, így léphet be új csevegőszobába�"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <partnerazonosító>: információk megjelenítése egy partnerről"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1400,113 +1421,129 @@ msgstr ""
 "/help [<parancs>]: minden támogatott parancs megjelenítése. Ha a <parancs> "
 "meg van adva, akkor annak használatát jeleníti meg."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Használat: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ismeretlen parancs, lásd a /help kimenetét az elérhető parancsokért"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "Az egyenleg nem elég az üzenet elküldéséhez"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "hiba a(z) „%s� üzenet elküldésekor: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Hiba az üzenet elküldésekor: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"Az egyenleg nem elég az üzenet elküldéséhez. <a href='%s'>Feltöltés</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "nem lehetséges"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "kilépett"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "érvénytelen partner"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "túl hosszú üzenet"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "nincs megvalósítva"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "hiba a(z) „%s� üzenet elküldésekor: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Hiba az üzenet elküldésekor: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma beállítva: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "%s beállította a témát erre: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Nincs megadva témakör"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Nincs javaslat)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "„%s� hozzáadása a szótárhoz"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "„%s� hozzáadása a(z) %s szótárhoz"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Helyesírási javaslatok"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Nem sikerült lekérni a legutóbbi naplókat"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s kilépett"
@@ -1514,12 +1551,12 @@ msgstr "%s kilépett"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s kirúgta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kirúgva"
@@ -1527,17 +1564,17 @@ msgstr "%s kirúgva"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s kitiltotta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s kitiltva"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s elhagyta a szobát"
@@ -1547,17 +1584,17 @@ msgstr "%s elhagyta a szobát"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s belépett a szobába"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
@@ -1565,90 +1602,90 @@ msgstr "%s mostantól %s néven ismert"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Szeretné tárolni ezt a jelszót?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Most nem"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Újra"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Hibás jelszó, próbálja újra:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Ezt a szobát jelszó védi:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Társalgás"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ismeretlen vagy érvénytelen azonosító"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "A partnerblokkolás ideiglenesen nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "A partnerblokkolás nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "A partner nem blokkolható"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Blokkolt partnerek szerkesztése"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Felhasználói fiók:"
 
@@ -1658,463 +1695,380 @@ msgstr "Blokkolt partnerek"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "Hivatkozás cí_mének másolása"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Hivatkozás megnyitása"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%Y. %B %e %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Partnerinformációk szerkesztése"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Személyes információk"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Új partner"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkolja Å‘t: %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Biztosan nem szeretné, hogy „%s� újra felvegye Önnel a kapcsolatot?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokkolás"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Partner jelentése visszaélőként"
 msgstr[1] "_Partnerek jelentése visszaélőként"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Döntés később"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Feliratkozási kérés"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Felhasználó blokkolása"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Csoportosítatlan"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Kedvenc partnerek"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Valóban el kívánja távolítani a(z) „%s� csoportot?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Csoport eltávolítása"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Eltávolítás"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Valóban el kívánja távolítani „%s� partnert?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Partner eltávolítása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Partner _felvétele…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Partner _blokkolása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Csevegés"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Hanghívás"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videohívás"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "K_orábbi társalgások"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Fájl küldése"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Az asztalom megosztása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Kedvenc"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Információk"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "S_zerkesztés"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Meghívás ebbe a szobába"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Meg_hívás csevegőszobába"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Döntés később"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Partnerek keresése"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Keresés: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Partner _felvétele"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nem található partner"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "A bemutatkozó üzenete:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Kérem engedélyezze, hogy láthassam az állapotát. Köszönöm!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Válasszon partnert"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Teljes név:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonszám:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail cím:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Weboldal:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Születésnap:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Utoljára látszott:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Kapcsolódva innen:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Távol üzenet:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Csatornák:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Ország ISO kódja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Ország:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "�llapot:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Város:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Terület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Irányítószám:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Utca:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Épület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Emelet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Szoba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Szöveg:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Pontossági szint:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Hiba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Függőleges hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vízszintes hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Irány:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Emelkedési sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Utolsó frissítés:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Hosszúság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Szélesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Magasság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Hely"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y. %B %e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Avatar mentése"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Az avatar nem menthető"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Hely</b> az időpontban\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "�lnév:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Kliensinformációk"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Kliens:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "Személyes adatok"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Partner részletei"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "Teljes név"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "Telefonszám"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "E-mail cím"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "Weboldal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "Születésnap"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Utoljára látszott:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Kapcsolódva innen:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Távol üzenet:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "munkahelyi"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "otthoni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "hang"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "előnyben részesített"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postai "
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "postafiók"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Azonosító:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "�lnév:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Hely</b> az időpontban\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Információk lekérve…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Kliensinformációk"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Verzió:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Kliens:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Csoportok"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2122,105 +2076,171 @@ msgstr ""
 "Válassza ki azokat a csoportokat, amelyekben a partner megjelenjen, "
 "kiválaszthat nulla vagy több csoportot is."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Csoport _hozzáadása"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Kijelölés"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Csoport"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "A következő azonosító blokkolva lesz:"
 msgstr[1] "A következő azonosítók blokkolva lesznek:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "A következő azonosító nem blokkolható:"
 msgstr[1] "A következő azonosítók nem blokkolhatók:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Összekapcsolt partnerek"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Válasszon összekapcsolandó partnereket"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Új partner előnézete"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Partnerinformációk szerkesztése"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Válassza ki a fiókot a hívás indításához"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Hívás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "OTTHONI"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "Partner _blokkolása"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Csevegés"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Hanghívás"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videohívás"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "K_orábbi társalgások"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Fájl küldése"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Az asztalom megosztása"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Kedvenc"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "A gnome-contacts nincs telepítve"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "A partneradatok eléréséhez telepítse a gnome-contacts alkalmazást."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Információk"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Partnerek összekapcsolása…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Meghívás ebbe a szobába"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Meg_hívás csevegőszobába"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Partner _felvétele…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "_Törlés és blokkolás"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Valóban el kívánja távolítani a(z) „%s� csoportot?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Csoport eltávolítása"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Eltávolítás"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Valóban el kívánja távolítani „%s� partnert?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2229,7 +2249,11 @@ msgstr ""
 "Valóban el akarja távolítani a(z) %s gyűjtőpartnert? Ne feledje, hogy ez "
 "minden partnert eltávolít, amelyek ezt a gyűjtőpartnert alkotják."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Partner eltávolítása"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2240,23 +2264,23 @@ msgstr[1] "%u partnert tartalmazó gyűjtőpartner"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Hely</b> az időpontban"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Telefonról vagy mobil eszközről lépett be"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Új hálózat"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Válasszon IRC-hálózatot"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Hálózatok listájának visszaállítása"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Kijelölés"
@@ -2269,247 +2293,263 @@ msgstr "új kiszolgáló"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Partnerek összekapcsolása"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "S_zétválasztás…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "A megjelenített gyűjtőpartner szétvágása az azt alkotó partnerekké."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "Összekap_csolás"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Szétválasztja a(z) „%s� gyűjtőpartnert?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Biztos, hogy szétválasztja ezt a gyűjtőpartnert? Ez a gyűjtőpartnert "
-"véglegesen az azt alkotó partnerekké választja szét."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "S_zétválasztás"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Előzmények"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Csevegés itt: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Csevegés vele: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y. %B %e %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s másodperc"
 msgstr[1] "%s másodperc"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s perc"
 msgstr[1] "%s perc"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hívás hossza: %s, befejezve: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Ma"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y. %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Bármikor"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Mikor"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Bármi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Szöveges csevegések"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Bejövő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Kimenő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Nem fogadott hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Mi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Biztosan törölni szeretné a korábbi társalgások minden naplóját?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Összes törlése"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Törlés innen:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Betöltés…</span>"
+msgid "_File"
+msgstr "_Fájl"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Csevegés"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "S_zerkesztés"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Minden előzmény törlése…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Videó"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Csevegés"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "S_zerkesztés"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Videó"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fájl"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "2. oldal"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Partnerazonosító:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Betöltés…</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Cse_vegés"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "A partner kilépett"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "A kiválasztott partner nem érvényes vagy ismeretlen"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "A partner nem támogatja ezt a fajta csevegést"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "A kért funkció nincs megvalósítva ehhez a protokollhoz"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nem kezdhető társalgás a kiválasztott partnerrel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Kitiltották erről a csatornáról"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "A csatorna tele van"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "Ehhez a csatornához csak meghívással csatlakozhat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "Ez nem folytatható, amíg kilépett állapotban van"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "Hozzáférés megtagadva"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "Hiba történt a társalgás indításakor"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Adjon meg egy partnerazonosítót vagy telefonszámot:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Új társalgás"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "_Videó küldése"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "_Videohívás"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Hívás"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "_Hanghívás"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Új hívás"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "A hitelesítés meghiúsult a(z) <b>%s</b> fiókhoz"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2546,12 +2586,8 @@ msgstr "Kattintson ezen állapot kedvenccé tételéhez"
 msgid "Set status"
 msgstr "�llapot beállítása"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Jelenlét és aktuális állapot megadása"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Egyéni üzenetek…"
 
@@ -2559,7 +2595,7 @@ msgstr "Egyéni üzenetek…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Új %s fiók"
@@ -2569,20 +2605,20 @@ msgid "Find:"
 msgstr "Keresés:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Kis- és _nagybetűk"
+msgid "_Previous"
+msgstr "_Előző"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "A kifejezés nem található"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Következő"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Kis- és _nagybetűk"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Előző"
+msgid "Phrase not found"
+msgstr "A kifejezés nem található"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2628,12 +2664,12 @@ msgstr "A hanghívás befejeződött"
 msgid "Edit Custom Messages"
 msgstr "Egyéni üzenetek szerkesztése"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Ãœzenet szerkesztve ekkor: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normál"
 
@@ -2675,14 +2711,16 @@ msgstr "A tanúsítvány nem rendelkezik a várt ujjlenyomattal."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
+msgstr ""
+"A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
 msgstr "A tanúsítvány önaláírt."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "A tanúsítványt visszavonta a kibocsátó hitelesítésszolgáltató."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2708,34 +2746,39 @@ msgid "Certificate hostname: %s"
 msgstr "A tanúsítvány gépneve: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Folytatás"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "_Folytatás"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nem megbízható kapcsolat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A kapcsolat nem megbízható, mindenképp folytatja?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Emlékezzen a válaszra a jövőbeli kapcsolatokhoz"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Tanúsítvány részletei"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Az URI nem nyitható meg"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Válasszon ki egy fájlt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Nincs elég szabad hely a fájl mentéséhez"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2744,7 +2787,7 @@ msgstr ""
 "%s szabad hely szükséges a fájl mentéséhez, de csak %s érhető el. Válasszon "
 "másik helyet."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Bejövő fájl %s partnertől"
@@ -2916,39 +2959,31 @@ msgstr "Nyugati"
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "A kiválasztott partner nem képes fájlok fogadására."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "A kiválasztott partner kilépett."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nincs hibaüzenet"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Azonnali üzenet (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne kapcsolódjon indításkor"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne jelenjen meg a partnerlista vagy más ablak indításkor"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Hiba a fiókkezelő elérésekor"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2994,234 +3029,94 @@ msgstr ""
 "nem kapta meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "A GNOME üzenetküldő-kliense"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Kelemen Gábor <kelemeng at gnome dot hu>\n"
 "Meskó Balázs <meskobalazs at gmail dot com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Hiba történt a fiókok importálásakor."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Hiba történt a fiókrészletek feldolgozásakor."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Hiba történt a fiók létrehozásakor."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Hiba történt."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A hibaüzenet: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Visszaléphet és megpróbálhatja újra megadni a fiókja részleteit, vagy "
-"kiléphet ebből az asszisztensből és később a Szerkesztés menüből vehet fel "
-"fiókokat."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Hiba történt"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Milyen típusú csevegőfiókja van?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Van más fiókja, amit be szeretne állítani?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Adja meg fiókjának adatait"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Szeretne létrehozni más csevegőfiókokat?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Adja meg az új fiók részleteit"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Az Empathy segítségével cseveghet a közelében elérhető emberekkel, valamint "
-"a Google Talkot, AIM-ot, MSN-t és sok más csevegőprogramot használó "
-"barátaival és kollégáival. Ha rendelkezik mikrofonnal és webkamerával, akkor "
-"hang- és videohívásokat is bonyolíthat."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Igen, fiókadatok importálása ebből: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Igen, megadom a fiókom adatait"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nem, új fiókot szeretnék készíteni"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Válassza ki az importálandó fiókot:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Igen"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nem, most csak ennyit akartam"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Az Empathy képes automatikusan feltérképezni az Önével azonos hálózatra "
-"csatlakozó felhasználókat, és csevegni velük. Ha használni szeretné ezt a "
-"szolgáltatást, akkor ellenőrizze a lenti részletek helyességét. Ezeket "
-"később is egyszerűen módosíthatja, vagy letilthatja a „Fiókok� ablak "
-"segítségével."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Szerkesztés → Fiókok"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_Egyelőre nem engedélyezem ezt a szolgáltatást"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Nem lesz képes a helyi hálózatára csatlakozó személyekkel csevegni, mert "
-"nincs telepítve a telepathy-salut. Ha be szeretné kapcsolni ezt a "
-"szolgáltatást, akkor telepítse a telepathy-salut csomagot, és hozzon létre "
-"egy Közeli emberek fiókot a Fiókok ablakban."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "A telepathy-salut nincs telepítve"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Üzenetküldő- és VoIP-fiók varázsló"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Üdvözöljük az Empathyban"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Meglévő fiókok importálása"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Adja meg személyes adatait"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Az Ön %s fiókjának módosításai nincsenek elmentve."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Új fiókja még nincs elmentve."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Kapcsolódás…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Kilépett – %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Kapcsolat bontva – %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Kilépett – Nincs hálózati kapcsolat"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"A fiók letiltva, mert egy régi, nem támogatott háttérprogramot használ. "
+"Telepítse a telepathy-haze csomagot, és indítsa újra a munkamenetet a fiók "
+"átköltöztetéséhez."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Kilépett – Fiók letiltva"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n"
-"Biztosan folytatni akarja?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "Kapcsolatparaméterek szerkesztése"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "A személyes adatainak lekérése meghiúsult a kiszolgálóról."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Személyes információnak szerkesztése online."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Kapcsolatparaméterek szerkesztése…"
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Valóban el kívánja távolítani a(z) %s fiókot a számítógépről?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ez nem távolítja el a kiszolgálón lévő fiókot."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3230,15 +3125,24 @@ msgstr ""
 "Biztosan folytatni akarja?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Letiltás"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Kihagyás"
+
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "Kapcs_olódás"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,19 +3154,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Hozzáadás…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Fiókinformációk betöltése"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nincs telepítve protokoll"
+msgid "_Import…"
+msgstr "_Importálás…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Fiókinformációk betöltése"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3270,132 +3170,118 @@ msgstr ""
 "Új fiók létrehozásához először telepítenie kell egy háttérprogramot minden "
 "használandó protokollhoz."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importálás…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "Nincsenek telepítve protokoll-háttérprogramok"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " – Empathy hitelesítési kliens"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy hitelesítési kliens"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Közeli emberek"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy hang/videó kliens"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy hang/videó kliens"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Fényerő"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Hangerő"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Oldalsáv"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Hangbemenet"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videobemenet"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Tárcsázókészülék"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Részletek"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "%s hívása"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "A gép által látott IP-cím"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Az interneten lévő kiszolgáló által látott IP-cím"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "A partner másik oldal által látott IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Közvetítő kiszolgáló IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Üzenetszórási csoport IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Kapcsolódva – %d.%02dp"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Technikai részletek"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3404,8 +3290,8 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "hangformátumot sem"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3414,8 +3300,8 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "videoformátumot sem"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3424,23 +3310,26 @@ msgstr ""
 "Nem hozható létre kapcsolat %s partnerhez. Lehet, hogy egyikük közvetlen "
 "kapcsolatot nem engedélyező hálózatot használ."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hálózati hiba történt"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr "A híváshoz szükséges hangformátumok nincsenek telepítve a számítógépre"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3451,262 +3340,314 @@ msgstr ""
 "a hibát</a>, és csatolja a Súgó menü „Hibakeresés� ablakából elérhető "
 "naplókat."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hiba történt a hívási alrendszerben"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "A folyam vége elérve"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nem hozható létre a hangfolyam"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nem hozható létre a videofolyam"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Hang"
+msgid "_Call"
+msgstr "_Hívás"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Dekódoló kodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Kamera letiltása"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Tárcsázókészülék megjelenítése"
+msgid "_Settings"
+msgstr "_Beállítások"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kódoló kodek:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Nézet"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Befejezés"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Súgó"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Aktuális hívás befejezése"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Tartalom"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Helyi jelölt:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Hibakeresés"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximalizálás"
+msgid "Swap camera"
+msgstr "Kamera cseréje"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimalizálás"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Távoli jelölt:"
+msgid "Maximise me"
+msgstr "Maximalizálás"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Hang küldése"
+msgid "Disable camera"
+msgstr "Kamera letiltása"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Videó küldése"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Befejezés"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Tárcsázókészülék"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Aktuális hívás befejezése"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videohívás"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Videohívás indítása"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Hanghívás indítása"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Kamera cseréje"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Hangátvitel be/ki"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Videoátvitel be/ki"
+msgid "Show dialpad"
+msgstr "Tárcsázókészülék"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Ismeretlen"
+msgid "Display the dialpad"
+msgstr "Tárcsázókészülék megjelenítése"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Videó küldése"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videohívás"
+msgid "Toggle video transmission"
+msgstr "Videoátvitel be/ki"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Hívás"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Hang küldése"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Tartalom"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Hangátvitel be/ki"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Hibakeresés"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kódoló kodek:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Súgó"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Dekódoló kodek:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Távoli jelölt:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Beállítások"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Helyi jelölt:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Nézet"
+msgid "Audio"
+msgstr "Hang"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "Bezárja ezt az ablakot?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Az ablak bezárásával elhagyja ezt: %s. Az újracsatlakozásig nem fog további "
+"üzeneteket kapni."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Az ablak bezárásával elhagyja a csevegőszobát. Az újracsatlakozásig nem fog "
+"további üzeneteket kapni."
+msgstr[1] ""
+"Az ablak bezárásával elhagy %u csevegőszobát. Az újracsatlakozásig nem fog "
+"további üzeneteket kapni."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "Elhagyja ezt: %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Az újracsatlakozásig nem fog további üzeneteket kapni ebből a "
+"csevegőszobából."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Ablak bezárása"
+
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr "Szoba elhagyása"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d olvasatlan)"
 msgstr[1] "%s (%d olvasatlan)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (és %u egyéb)"
 msgstr[1] "%s (és %u egyéb)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d olvasatlan másoktól)"
 msgstr[1] "%s (%d olvasatlan másoktól)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d olvasatlan mindenkitől)"
 msgstr[1] "%s (%d olvasatlan mindenkitől)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d üzenet küldése"
 msgstr[1] "%d üzenet küldése"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Üzenet írása."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Törlés"
+msgid "_Conversation"
+msgstr "_Társalgás"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Partner"
+msgid "C_lear"
+msgstr "_Törlés"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ha_ngulatjel beszúrása"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Kedvenc csevegőszoba"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "_Résztvevő meghívása…"
+msgid "Notify for All Messages"
+msgstr "Értesítés az összes hibaüzenetről"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Lap _balra"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Partnerlista m_utatása"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Lap j_obbra"
+msgid "Invite _Participant…"
+msgstr "_Résztvevő meghívása…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Értesítés az összes hibaüzenetről"
+msgid "C_ontact"
+msgstr "_Partner"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Társalgás"
+msgid "_Tabs"
+msgstr "_Lapok"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Lap leválasztása"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Kedvenc csevegőszoba"
+msgid "_Previous Tab"
+msgstr "_Előző lap"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Következő lap"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Előző lap"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Lapbezárás _visszavonása"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Partnerlista m_utatása"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Lap _balra"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Lapok"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Lap j_obbra"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Lapbezárás _visszavonása"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Lap leválasztása"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3720,100 +3661,100 @@ msgstr "Szoba"
 msgid "Auto-Connect"
 msgstr "Automatikus kapcsolódás"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Kedvenc szobák kezelése"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Bejövő videohívás"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s videón hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Bejövő hívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Válasz"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Válasz videóval"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Bejövő videohívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Szobameghívás"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Meghívás a csatlakozásra ehhez: %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kéri, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s megkérte, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Megkérték, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Bejövő fájlátvitel %s partnertől"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s engedélyt kér, hogy láthassa az Ön elérhető állapotát"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3823,105 +3764,105 @@ msgstr ""
 "Ãœzenet: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, összesen %s; %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "„%s� fogadása %s partnertől"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "„%s� küldése %s partnernek"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Hiba „%s� fogadásakor %s partnertől"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Hiba a fájl fogadásakor"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Hiba „%s� küldésekor %s partnernek"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Hiba a fájl küldésekor"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s� érkezett %s partnertől"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s� elküldve %s partnernek"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Várakozás a partner válaszára"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "„%s� integritásának ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "„%s� ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fájl"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Hátralévő"
 
@@ -3931,9 +3872,15 @@ msgstr "Fájlátvitelek"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
+msgstr ""
+"Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
+
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Importálás"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3941,171 +3888,197 @@ msgstr ""
 "Nem találhatók importálható fiókok. Az Empathy jelenleg csak a Pidginből "
 "támogatja a fiókok importálását."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Fiókok importálása"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importálás"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Forrás"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Adja meg a jelszót"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Leválasztás"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Be kell állítani egy fiókot, hogy itt partnereket láthasson."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nincs találat"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Elnézést, a(z) %s fiókok nem használhatók a(z) %s szoftver frissítéséig."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Szoftver frissítése…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Bezárás"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Újracsatlakozás"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Fiók szerkesztése"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Bezárás"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "%s feltöltése (%s)…"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fiókegyenleg feltöltése"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Feltöltés…"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Partner"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Engedélyezni kell az egyik fiókját, hogy itt partnereket láthasson."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Engedélyezni kell ezt: %s, hogy itt partnereket láthasson."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Partnerlista"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Partnerek térképen"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "Fiókbeállítások"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Egyenleg"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Új _társalgás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Keresés a partnerlistában"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Új _hívás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Csatlakozás a kedvencekhez"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "Partnerek _keresése…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Kedvencek kezelése"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Fájlátvitelek"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormál méret"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Kilé_pett partnerek"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Új _hívás…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Protokollok megjelenítése"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normál méret _avatarokkal"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Egyenleg"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Partnerek térképen"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Fiókok"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Bl_okkolt partnerek"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "B_eállítások"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Protokollok megjelenítése"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Keresés a partnerlistában"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Rendezés _név szerint"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Rendezés álla_pot szerint"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Fiókok"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normál méret _avatarokkal"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Bl_okkolt partnerek"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormál méret"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Tömör méret"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Fájlátvitelek"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Sz_oba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Csatlakozás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Új _társalgás…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Kilé_pett partnerek"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "S_zemélyes információk"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Sz_oba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Csatlakozás a kedvencekhez"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "Partnerek _keresése…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Kedvencek kezelése"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Csevegőszoba"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Tagok"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4118,30 +4091,40 @@ msgstr ""
 "Jelszó szükséges: %s\n"
 "Tagok: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Igen"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nem"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Nem indítható a szobalistázás"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Nem állítható le a szobalistázás"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Nem tölthető be a szobalista"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Csatlakozás a szobához"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Itt adja meg a szoba nevét a csatlakozáshoz, vagy kattintson néhány, a "
 "listán látható szobára."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sz_oba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4149,379 +4132,398 @@ msgstr ""
 "Adja meg a szobát üzemeltető kiszolgáló nevét, vagy hagyja üresen ha a szoba "
 "a jelenlegi fiókéval egyező kiszolgálón van"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Csatlakozás a szobához"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Nem tölthető be a szobalista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Szobalista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sz_oba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Üzenet érkezett"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Új társalgás"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Partner belép"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Partner kilép"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Fiók kapcsolódott"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Fiók kapcsolata bontva"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Nyelv"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Júlia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # http://mek.oszk.hu/00400/00492/00492.htm
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ó, Romeo, mért vagy te Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Tagadd meg az atyád, neved hajítsd el,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "S ha nem teszed meg, esküdj édesemmé"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "És nem leszek Capulet én se többé."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Hallgassak-e vagy szóljak-e neki?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Júlia kilépett"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Beállítások"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "_Hangulatjelek képekké alakítása"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Partnerlista m_utatása szobákban"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Megjelenés"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Viselkedés"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Csevegések indítása itt:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Csevegés té_mája:"
+msgid "new ta_bs"
+msgstr "új lap_ok"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "É_rtesítések tiltása, ha távol vagy elfoglalt vagyok"
+msgid "new _windows"
+msgstr "új _ablakok"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Hangok tiltása, ha _távol vagy elfoglalt vagyok"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Bejövő események megjelenítése az értesítési területen"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "A_utomatikus kapcsolódás indításkor"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"A visszhang-csillapítás segítségével hangja tisztábban fog hallatszani a másik "
-"félnél, de egyes számítógépeken problémákat okozhat. Ha Ön vagy a hívott "
-"partner fura zajokat vagy hanghibákat hall a hívás során, akkor próbálja meg "
-"kikapcsolni a visszhang-csillapítást, és újraindítani a hívást."
+msgid "Log conversations"
+msgstr "Társalgások naplózása"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
+msgid "Behavior"
+msgstr "Viselkedés"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
+msgid "General"
+msgstr "�ltalános"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
+msgid "_Enable bubble notifications"
+msgstr "B_uborékértesítések engedélyezése"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
+msgid "Disable notifications when _away or busy"
+msgstr "É_rtesítések tiltása, ha távol vagy elfoglalt vagyok"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "�ltalános"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Bemeneti szint:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Bemeneti hangerő:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Értesítések"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Helyforrások:"
+msgid "_Enable sound notifications"
+msgstr "H_angos értesítések engedélyezése"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Társalgások naplózása"
+msgid "Disable sounds when _away or busy"
+msgstr "Hangok tiltása, ha _távol vagy elfoglalt vagyok"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Értesítések"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Hang lejátszása eseményekhez"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Hangok"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Adatvédelem"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Hívásminőség javítása _visszhangcsillapítás használatával"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"A hely pontosságának csökkentése azt jelenti, hogy a tartózkodási helyéről "
-"csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
-"hely pontosságúak lesznek."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "_Hangulatjelek képekké alakítása"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Partnerlista m_utatása szobákban"
+"A visszhang-csillapítás segítségével hangja tisztábban fog hallatszani a "
+"másik félnél, de egyes számítógépeken problémákat okozhat. Ha Ön vagy a "
+"hívott partner fura zajokat vagy hanghibákat hall a hívás során, akkor "
+"próbálja meg kikapcsolni a visszhang-csillapítást, és újraindítani a hívást."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Hangok"
+msgid "_Publish location to my contacts"
+msgstr "_Hely közzététele a partnereimnek"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Helyesírás-ellenőrzés"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
-"van szótár."
+"A hely pontosságának csökkentése azt jelenti, hogy a tartózkodási helyéről "
+"csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
+"hely pontosságúak lesznek."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Témák"
+msgid "_Reduce location accuracy"
+msgstr "Hely pontosságának _csökkentése"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Hívásminőség javítása _visszhangcsillapítás használatával"
+msgid "Privacy"
+msgstr "Adatvédelem"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Változat:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "A_utomatikus kapcsolódás indításkor"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "B_uborékértesítések engedélyezése"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Hálózat (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "H_angos értesítések engedélyezése"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Helyforrások:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
+"van szótár."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Hálózat (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "Új csevegések megnyitása _külön ablakokban"
+msgid "Spell Checking"
+msgstr "Helyesírás-ellenőrzés"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Hely közzététele a partnereimnek"
+msgid "Chat Th_eme:"
+msgstr "Csevegés té_mája:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Változat:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "Hely pontosságának _csökkentése"
+msgid "Themes"
+msgstr "Témák"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "�llapot"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Partner újrahívása"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera ki"
+msgid "Redial"
+msgstr "Újratárcsázás"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera be"
+msgid "V_ideo"
+msgstr "Vi_deó"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Videó ki"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kamera kikapcsolása és a képküldés leállítása"
+msgid "Video Preview"
+msgstr "Videoelőnézet"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Kamera bekapcsolása és kép küldése"
+msgid "Video On"
+msgstr "Videó be"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Kamera bekapcsolása, de ne küldjön képet"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Partner újrahívása"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Előnézet"
+msgid "Camera Off"
+msgstr "Kamera ki"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Újratárcsázás"
+msgid "Disable camera and stop sending video"
+msgstr "Kamera kikapcsolása és a képküldés leállítása"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Vi_deó"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Előnézet"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Videó ki"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Kamera bekapcsolása, de ne küldjön képet"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Videó be"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera be"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoelőnézet"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Kamera bekapcsolása és kép küldése"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Partner térképnézete"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin hivatkozás"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin válasz"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Túl nagy egyetlen beillesztéshez. Mentse a naplókat fájlba."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Hibakeresési ablak"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Küldés pastebinbe"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Szint "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Információ"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Ãœzenet"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritikus"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategória"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Szint"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4529,127 +4531,434 @@ msgstr ""
 "A kiválasztott kapcsolatkezelő nem támogatja a távoli hibakeresési "
 "kiterjesztést."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Résztvevő meghívása"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Válassza ki a társalgásba meghívandó partnert:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ne jelenítsen meg párbeszédeket, a feladatok (például importálás) végén "
 "lépjen ki"
 
-#: ../src/empathy-accounts.c:187
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek� fiókok vannak"
+#: ../src/empathy-accounts.c:184
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek� fiókok vannak"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<fiókazonosító>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "– Empathy fiókkezelő"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy fiókkezelő"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Adott szolgáltatás megjelenítése"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "– Empathy hibakereső"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy hibakereső"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Válasz"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Válasz"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Válasz videóval"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Visszalépés"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Elfogadás"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Megadás"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s megpróbálta felhívni, de Ön egy másik beszélgetést folytatott."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Várakoztatás"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Némítás"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Időtartam"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d.%02dp"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Jelenlegi egyenlege: %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Elnézést, nincs elég kreditje ehhez a híváshoz."
+
+#: ../src/empathy-call-window.c:3167
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "Feltöltés"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Kis- és _nagybetű"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Milyen típusú csevegőfiókja van?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "Új fiók hozzáadása"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Közeli emberek"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Az Empathy képes automatikusan feltérképezni az Önével azonos hálózatra "
+"csatlakozó felhasználókat, és csevegni velük. Ha használni szeretné ezt a "
+"szolgáltatást, akkor ellenőrizze a lenti részletek helyességét."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Ezeket az adatokat később is módosíthatja, vagy letilthatja a szolgáltatást "
+"a <span style=\"italic\">Szerkesztés → Fiókok</span> segítségével."
+
+#~ msgid "Call volume"
+#~ msgstr "Hívás hangereje"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Hívás hangereje százalékban."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Az Empathy átköltöztette az MSN-naplókat"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Az Empathy átköltöztette-e az MSN naplókat."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "A foglalattípus nem támogatott"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Webes fiókjaim"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A(z) %s fiók szerkesztésre kerül a(z) %s használatával."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "A webes fiókjaim elindítása"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s szerkesztése"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Mé_gse"
+
+#~ msgid "Personal Information"
+#~ msgstr "Személyes információk"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Csoportosítatlan"
+
+#~ msgid "Favorite People"
+#~ msgstr "Kedvenc partnerek"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "S_zerkesztés"
+
+#~ msgid "Select a contact"
+#~ msgstr "Válasszon partnert"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Összekapcsolt partnerek"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Válasszon összekapcsolandó partnereket"
+
+#~ msgid "New contact preview"
+#~ msgstr "Új partner előnézete"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Partnerek összekapcsolása…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Partnerek összekapcsolása"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "S_zétválasztás…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "A megjelenített gyűjtőpartner szétvágása az azt alkotó partnerekké."
+
+#~ msgid "_Link"
+#~ msgstr "Összekap_csolás"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Szétválasztja a(z) „%s� gyűjtőpartnert?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Biztos, hogy szétválasztja ezt a gyűjtőpartnert? Ez a gyűjtőpartnert "
+#~ "véglegesen az azt alkotó partnerekké választja szét."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "S_zétválasztás"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Partnerazonosító:"
+
+#~ msgid "C_hat"
+#~ msgstr "Cse_vegés"
+
+#~ msgid "Send _Video"
+#~ msgstr "_Videó küldése"
+
+#~ msgid "C_all"
+#~ msgstr "_Hívás"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Jelenlét és aktuális állapot megadása"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "A kiválasztott partner nem képes fájlok fogadására."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "A kiválasztott partner kilépett."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Hiba történt a fiókok importálásakor."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Hiba történt a fiókrészletek feldolgozásakor."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Hiba történt a fiók létrehozásakor."
+
+#~ msgid "There was an error."
+#~ msgstr "Hiba történt."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "A hibaüzenet: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Visszaléphet és megpróbálhatja újra megadni a fiókja részleteit, vagy "
+#~ "kiléphet ebből az asszisztensből és később a Szerkesztés menüből vehet "
+#~ "fel fiókokat."
+
+#~ msgid "An error occurred"
+#~ msgstr "Hiba történt"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Van más fiókja, amit be szeretne állítani?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Adja meg fiókjának adatait"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Szeretne létrehozni más csevegőfiókokat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Adja meg az új fiók részleteit"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Az Empathy segítségével cseveghet a közelében elérhető emberekkel, "
+#~ "valamint a Google Talkot, AIM-ot, MSN-t és sok más csevegőprogramot "
+#~ "használó barátaival és kollégáival. Ha rendelkezik mikrofonnal és "
+#~ "webkamerával, akkor hang- és videohívásokat is bonyolíthat."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Igen, fiókadatok importálása ebből: "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Igen, megadom a fiókom adatait"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nem, új fiókot szeretnék készíteni"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Válassza ki az importálandó fiókot:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nem, most csak ennyit akartam"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Szerkesztés → Fiókok"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Egyelőre nem engedélyezem ezt a szolgáltatást"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Nem lesz képes a helyi hálózatára csatlakozó személyekkel csevegni, mert "
+#~ "nincs telepítve a telepathy-salut. Ha be szeretné kapcsolni ezt a "
+#~ "szolgáltatást, akkor telepítse a telepathy-salut csomagot, és hozzon "
+#~ "létre egy Közeli emberek fiókot a Fiókok ablakban."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Üzenetküldő- és VoIP-fiók varázsló"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Üdvözöljük az Empathyban"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Meglévő fiókok importálása"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Adja meg személyes adatait"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n"
+#~ "Biztosan folytatni akarja?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoll:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgid "_Personal Information"
+#~ msgstr "S_zemélyes információk"
+
+#~ msgid "Input level:"
+#~ msgstr "Bemeneti szint:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Bemeneti hangerő:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Új csevegések megnyitása _külön ablakokban"
diff --git a/po/it.po b/po/it.po
index e603fb041..186239677 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,24 +1,23 @@
 # Italian translation for Empaty
-# Copyright (C) 2003-2010, 2011 The Free Software Foundation, Inc.
+# Copyright (C) 2003-2010, 2011, 2012 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empaty package.
 # Fabio Bonelli <fabiobonelli@libero.it>, 2003 
 # Michele Baldessari <michele@pupazzo.org>, 2003 
-# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011.
 # Luca Ferretti <lferrett@gnome.org>, 2011.
+# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-14 17:48+0000\n"
-"PO-Revision-Date: 2011-10-17 10:11+0200\n"
-"Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-13 21:46+0100\n"
+"PO-Revision-Date: 2012-03-12 22:11+0100\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
+"Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -38,27 +37,29 @@ msgstr "Messaggistica Internet Empathy"
 msgid "IM Client"
 msgstr "Messaggistica istantanea"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestisce account di messaggistica e VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Account di messaggistica e VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Apre sempre in una finestra separata le nuove conversazioni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Volume chiamata"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Volume della chiamata in percentuale."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Device della videocamera"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Posizione della videocamera"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -66,55 +67,61 @@ msgstr ""
 "Il carattere da usare dopo il soprannome quando viene usato il completamento "
 "del soprannome nelle conversazioni di gruppo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Tema finestra di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Variante del tema della finestra di conversazione"
 
 # (ndt) non metto fr neanche dopo morto! :D
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Elenco dizionari per il controllo ortografico, separare gli elementi con "
 "virgole (es. \"it, en, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Elenco contatti compatto"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Indica se deve essere usato il gestore delle connessioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Criterio di ordinamento dell'elenco contatti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Percorso oggetto D-Bus dell'ultimo account selezionato per entrere in una "
+"stanza."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Device della videocamera predefinito da usare, come /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Directory predefinita da cui selezionare un'immagine per l'avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Disabilita le notifiche quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Disabilita i suoni quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Visualizza gli eventi in arrivo nell'area di stato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -122,280 +129,289 @@ msgstr ""
 "Visualizza gli eventi in arrivo nell'area di stato. Se FALSO, li mostra "
 "direttamente all'utente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Supporto soppressione dell'eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr ""
 "Indica se il programma può pubblicare la posizione geografica dell'utente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare il GPS per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Cartella predefinita per gli scaricamenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr ""
-"Indica se il programma ha eseguito la migrazione dei registri di butterfly"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Indica se il programma deve impostare automaticamente lo stato di assenza "
 "quando inattivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Indica se il programma deve connettersi automaticamente all'avvio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 "Indica se il programma deve ridurre la precisione della posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Indica se il programma deve usare l'immagine del contatto come icona della "
 "finestra della conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Abilita gli strumenti per sviluppatori di WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Abilita le notifiche per i nuovi messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Abilita il correttore ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Nasconde la finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Nasconde la finestra principale."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informa gli altri utenti quando si sta digitando"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "L'ultimo account selezionato nella finestra \"Entra nella stanza\""
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Numero magico utilizzato per la verifica sull'esecuzione dell'attività di "
+"puluzia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Carattere soprannome completato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Apre nuove conversazioni in finestre separate"
 
 # (ndt) messo con la maiuscola, dovrebbe essere con la maiuscola il nome originale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Percorso al tema di Adium da usare"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Il percorso al tema di Adium da usare se il tema scelto per la conversazione "
 "è Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Emette un suono all'arrivo dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Emette un suono per le nuove conversazioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Emette un suono all'invio dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Emette un suono quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Emette un suono quando un contatto si scollega"
 
 # (ndt) per cercare di renderla impersonale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Emette un suono quando l'utente locale si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Emette un suono quando l'utente locale si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Notifica se la conversazione non ha il focus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Notifica quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Notifica quando un contatto si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "La posizione dell'anteprima della videocamera durante una chiamata."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Mostra il saldo nell'elenco contatti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Mostra gli avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Show contact groups"
+msgstr "Mostra i gruppi dei contatti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show contact list in rooms"
 msgstr "Mostra l'elenco contatti nelle stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show hint about closing the main window"
 msgstr "Mostra suggerimento riguardo la chiusura della finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show offline contacts"
 msgstr "Mostra contatti fuori rete"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Show protocols"
 msgstr "Mostra i protocolli"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Spell checking languages"
 msgstr "Lingue controllo ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The default folder to save file transfers in."
 msgstr "La cartella predefinita in cui salvare i file ricevuti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The last directory that an avatar image was chosen from."
 msgstr "L'ultima directory da cui è stata scelta un'immagine per l'avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The position for the chat window side pane"
 msgstr "La posizione del riquadro laterale della finestra di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "Lo posizione (in pixel) salvata del riquadro laterale della finestra di "
 "conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Il tema usato per mostrare le conversazioni nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "La variante del tema usato per mostrare le conversazioni nelle finestre di "
 "conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use graphical smileys"
 msgstr "Utilizza faccine grafiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use notification sounds"
 msgstr "Utilizza suoni per le notifiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Use theme for chat rooms"
 msgstr "Utilizza un tema per le stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se il programma può pubblicare o meno la propria posizione geografica "
 "agli altri contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno il GPS per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Indica se il programma deve collegarsi o meno automaticamente agli account "
 "all'avvio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Indica se il programma deve impostare o meno automaticamente lo stato di "
 "assenza se l'utente è inattivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se il programma deve ridurre o meno la precisione della posizione "
 "geografica per motivi di privacy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se il programma deve usare o meno l'immagine del contatto come icona "
 "della finestra della conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se gli strumenti per sviluppatori di WebKit, come \"Ispettore web\", "
 "debbano essere abilitati."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -403,76 +419,84 @@ msgstr ""
 "Indica se deve essere usato o meno il gestore della connessione per "
 "disconnettersi/connettersi automaticamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica se verificare o meno le parole digitate con le lingue selezionate."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se convertire o meno le faccine in immagini grafiche durante le "
 "conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Indica se abilitare o meno il filtro di soppressione dell'eco di Pulseaudio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si collegano alla rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si scollegano dalla "
 "rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica se emettere o meno un suono per segnalare gli eventi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indica se emettere o meno un suono all'arrivo dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se emettere o meno un suono per le nuove conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se emettere o meno un suono per l'invio dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indica se emettere o meno un suono quando ci si collega in una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica se emettere o meno un suono quando ci si scollega da una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se emettere o meno notifiche sonore quando si è assenti o non "
 "disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se inviare gli stati \"composing\" o \"paused\" nella conversazione. "
+"Non modifica lo stato \"gone\"."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto va fuori rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto entra in rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -480,47 +504,51 @@ msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio "
 "anche se la finestra di conversazione è già aperta, ma non ha il focus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show account balances in the contact list."
 msgstr "Indica se mostrare o meno il saldo dell'account nell'elenco contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Indica se mostrare o meno le immagini dei contatti nell'elenco contatti e "
 "nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se mostrare o meno i contatti fuori rete nell'elenco dei contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se mostrare o meno i gruppi nell'elenco contatti."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrare o meno notifiche quando si è assenti o non disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Indica se mostrare o meno i protocolli per i contatti nell'elenco contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in chat rooms."
 msgstr ""
 "Indica se mostrare o meno l'elenco contatti nelle stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indica se mostrare o meno l'elenco contatti in modalità compatta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -528,47 +556,74 @@ msgstr ""
 "Indica se mostrare o meno un dialogo riguardo la chiusura della finestra "
 "principale con il pulsante \"x\" nella barra del titolo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usare o meno un tema per le stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Indica quale criterio usare per l'ordinamento dell'elenco contatti. "
-"L'ordinamento predefinito è quello secondo il nome del contatto con il "
-"valore \"name\". Il valore \"state\" ordina in base allo stato del contatto."
+"L'ordinamento predefinito è quello secondo lo stato del contatto con un "
+"valore di \"state\". Il valore \"name\" ordina in base al nome."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gestisce account di messaggistica e VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c utilizza questo numero per controllare se "
+"l'attività di pulizia deve essere eseguita o meno. Questa chiave non "
+"dovrebbe essere modificata."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Account di messaggistica e VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nessun motivo specificato"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "È stata richiesta la modifica dello stato"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "È stato annullato il trasferimento del file"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "L'altro utente ha annullato il trasferimento del file"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Errore nel tentativo di trasferire il file"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "L'altro utente non è in grado di trasferire il file"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Motivo sconosciuto"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferimento file completato, ma il file era danneggiato"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Il trasferimento di file non è supportato dal contatto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Il file selezionato non è un file regolare"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Il file selezionato è vuoto"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chiamata persa da %s"
@@ -585,172 +640,141 @@ msgstr "%s ha chiamato"
 msgid "Call from %s"
 msgstr "Chiamata da %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Tipo di socket non supportato"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nessun motivo specificato"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "È stata richiesta la modifica dello stato"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "È stato annullato il trasferimento del file"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "L'altro utente ha annullato il trasferimento del file"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Errore nel tentativo di trasferire il file"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "L'altro utente non è in grado di trasferire il file"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Motivo sconosciuto"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Non disponibile"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Assente"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Fuori rete"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Lo stato è impostato a «Fuori rete»"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Errore di rete"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autenticazione non riuscita"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Errore di cifratura"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome in uso"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificato non fornito"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificato non fidato"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificato scaduto"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificato non attivato"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Corrispondenza errata nel nome host del certificato"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Corrispondenza errata nell'impronta del certificato"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificato auto-firmato"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Errore nel certificato"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "La cifratura non è disponibile"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Il certificato non è valido"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "La connessione è stata rifiutata"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "La connessione non può essere stabilita"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "La connessione è stata persa"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Questa risorsa è già collegata al server"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Questo account è già collegato al server"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "La connessione è stata sostituita con una nuova che sfrutta la stessa risorsa"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "L'account esiste già sul server"
 
 # (ndt) rivedere too busy
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Il server è troppo carico per gestire la connessione"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Il cifrario utilizzato dall'algoritmo del certificato non è sicuro o ha una "
 "cifratura debole"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -758,156 +782,148 @@ msgstr ""
 "La lunghezza del certificato o la profondità della catena del certificato "
 "del server supera i limiti imposti dalla libreria di cifratura"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Il software in uso è troppo datato"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Errore interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Persone nelle vicinanze"
 
 # (ndt) opzione
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Giappone"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat di Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d secondo fa"
 msgstr[1] "%d secondi fa"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d settimana fa"
 msgstr[1] "%d settimane fa"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mese fa"
 msgstr[1] "%d mesi fa"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "nel futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Password non trovata"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Password account messaggistica per %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Password per la stanza «%s» sull'account %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Tutti gli account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Account online"
-
-# (ndt) idee su dove/cosa sia My Web Accounts?
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "L'account %s viene modificato attraverso «%s»."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "L'account %s non può essere modificato utilizzando il programma."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Lancia «Account online»"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Modifica %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pplica"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Acce_di"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Questo account esiste già sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Creare un nuovo account sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "A_nnulla"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s su %2$s"
@@ -915,12 +931,12 @@ msgstr "%1$s su %2$s"
 # (ndt) il %s pare sia il protocollo
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Account %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nuovo account"
 
@@ -969,7 +985,7 @@ msgstr "Ricordare la password"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Ricordare la password"
 
@@ -1305,7 +1321,7 @@ msgid "STUN Server:"
 msgstr "Server STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1388,61 +1404,65 @@ msgstr "Tutti i file"
 msgid "Click to enlarge"
 msgstr "Clic per ingrandire"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Si è verificato un errore nell'iniziare la chiamata"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Il contatto specificato non supporta le chiamate"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Il contatto specificato è fuori rete"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Il contatto specificato non è valido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Le chiamate di emergenza non sono supportate su questo protocollo"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Non si dispone di credito sufficiente per effettuare questa chiamata"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Apertura della conversazione privata non riuscita"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Argomento non supportato in questa conversazione"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Non si è autorizzati a modificare l'argomento"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» non è un ID di contatto valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1450,23 +1470,23 @@ msgstr ""
 "/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito "
 "quella attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1476,11 +1496,11 @@ msgstr ""
 "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato "
 "per entrare in una nuova stanza\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID contatto>: visualizza informazioni riguardo un contatto"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1488,114 +1508,127 @@ msgstr ""
 "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è "
 "definito, ne mostra l'uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando sconosciuto. Provare /help per i comandi disponibili."
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "saldo non sufficiente per inviare messaggi"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Errore nell'inviare il messaggio «%s»: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errore nell'inviare il messaggio: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "Saldo non sufficiente per inviare messaggi. <a href='%s'>Ricarica</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "non possibile"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "fuori rete"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "messaggio troppo lungo"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "non implementato"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Errore nell'inviare il messaggio «%s»: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Errore nell'inviare il messaggio: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Argomento impostato a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Argomento impostato a «%2$s» da %1$s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Nessun argomento definito"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Nessun suggerimento)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aggiungi «%s» al dizionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aggiungi «%s» al dizionario %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Inserisci faccina"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Invia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Suggerimenti ortografici"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Recupero dei registri recenti non riuscito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "L'utente %s si è disconnesso"
@@ -1603,13 +1636,13 @@ msgstr "L'utente %s si è disconnesso"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ha espulso %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "L'utente %s è stato espulso"
@@ -1617,19 +1650,19 @@ msgstr "L'utente %s è stato espulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ha bandito %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "L'utente %s è stato bandito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "L'utente %s ha lasciato la stanza"
@@ -1639,19 +1672,19 @@ msgstr "L'utente %s ha lasciato la stanza"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "L'utente %s è entrato nella stanza"
 
 # (ndt) per cercare di stare "asessuali"
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "L'utente %s è ora conosciuto come %s"
@@ -1660,91 +1693,91 @@ msgstr "L'utente %s è ora conosciuto come %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Salvare questa password?"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Ricorda"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Riprova"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Password errata. Provare nuovamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Questa stanza è protetta da una password:"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Entra"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Connessi"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversazione"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Identificatore sconosciuto o non valido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blocco del contatto momentaneamente non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blocco del contatto non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Permesso negato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Impossibile bloccare il contatto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Modifica contatti bloccati"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1756,19 +1789,19 @@ msgstr "Contatti bloccati"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copia indirizzo collegamento"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Apri c_ollegamento"
@@ -1776,44 +1809,34 @@ msgstr "Apri c_ollegamento"
 # (ndt) domenica 01 ottobre 2007
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-# (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Modifica informazioni contatto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informazioni personali"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Bloccare veramente «%s»? "
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Segnalare abuso da questo contatto"
@@ -1833,352 +1856,267 @@ msgstr "Richiesta di approvazione"
 msgid "_Block User"
 msgstr "_Blocca utente"
 
-# (ndt) inteso come "contatti"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Non raggruppati"
-
-# (ndt) inteso come "contatti"
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Preferiti"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Rimuovere veramente il gruppo «%s»?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Rimozione gruppo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Rimuovi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Rimuovere veramente il contatto «%s»?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Rimozione contatto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "A_ggiungi contatto..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blocca contatto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Conversazione"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "Chiamata _audio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "Chiamata _video"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Conversazioni _precedenti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Invia file"
-
-# (ndt) voce di menù
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Condividi desktop"
-
-# (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Preferito"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Informa_zioni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Invito per questa stanza"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Invita nella stanza"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Cerca contatti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Un messaggio di presentazione:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vorrei poter vedere quando sei online! Grazie!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Seleziona un contatto"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Numero di telefono:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Indirizzo email:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Sito web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Compleanno:"
-
-# (ndt) o "Ultimo avvistamento" :-)
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ultima attività:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Connessione da:"
-
-# (ndt) usato lo stesso di xchat-gnome
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Messaggio di assenza:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Codice ISO del paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Stato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Città:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Via:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Edificio:"
 
 # (ndt) questo è prima di una casella di testo
 # in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Piano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Testo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Livello di precisione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Errore verticale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Errore orizzontale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Orientamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Velocità di salita:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudine:"
 
 # (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Posizione geografica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, il giorno %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%-d %B %Y alle %H.%M UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Salva immagine"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Impossibile salvare l'immagine"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Dettagli personali"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Dettagli contatto"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Nome completo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Numero di telefono"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Indirizzo email"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Sito web"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Compleanno"
+
+# (ndt) o "Ultimo avvistamento" :-)
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Ultima attività:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connessione da:"
+
+# (ndt) usato lo stesso di xchat-gnome
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Messaggio di assenza:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "lavoro"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "casa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "cellulare"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voce"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferito"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postale"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
 # (ndt) messo 'alla data' per problemi con le date che iniziano con 8 e 11
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
@@ -2186,7 +2124,7 @@ msgstr "<b>Posizione</b> alla data\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Pseudonimo:"
 
@@ -2198,15 +2136,10 @@ msgstr "Informazioni client"
 msgid "Client:"
 msgstr "Client:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Dettagli contatto"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identificatore:"
 
@@ -2224,11 +2157,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versione:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2237,108 +2170,181 @@ msgstr ""
 "selezionarne più di uno oppure nessuno."
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "A_ggiungi gruppo"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selezione"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La seguente identità verrà bloccata:"
 msgstr[1] "Le seguenti identità verranno bloccate:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "La seguente identità non può essere bloccata:"
 msgstr[1] "Le seguenti identità non possono essere bloccate:"
 
+# (ndt) titolo dialogo
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Modifica informazioni contatto"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contatti uniti"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Selezionare i contatti da unire"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Anteprima nuovo contatto"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # (ndt) è un titolo...
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Selezione account per la chiamata"
 
 # (ndt) è il titolo del dialogo
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:349
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Chiamata"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "Casa"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "_Blocca contatto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1018
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Conversazione"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Chiamata _audio"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Chiamata _video"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Conversazioni _precedenti"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Invia file"
+
+# (ndt) voce di menù
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Condividi desktop"
+
+# (ndt) dovrebbe essere relativo a un contatto
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Preferito"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+msgid "gnome-contacts not installed"
+msgstr "Il software «gnome-contacts» non è installato"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Installare «gnome-contacts» per accedere ai dettagli dei contatti."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Informa_zioni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Unisci contatti..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Invito per questa stanza"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "_Invita nella stanza"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Elimina e _blocca"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Rimuovere veramente il gruppo «%s»?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Rimozione gruppo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Rimuovi"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Rimuovere veramente il contatto «%s»?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2347,8 +2353,12 @@ msgstr ""
 "Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà "
 "tutti i contatti di cui è composto."
 
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Rimozione contatto"
+
 # (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2364,20 +2374,20 @@ msgstr "<b>Posizione</b> alla data"
 msgid "Online from a phone or mobile device"
 msgstr "In rete da un telefono o dispositivo portatile"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nuova rete"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Scegliere una rete IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Ripristina ele_nco reti"
 
 #
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleziona"
@@ -2390,183 +2400,139 @@ msgstr "nuovo server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Unisci contatti"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Dividi..."
-
-# (ndt) suggerimento, tolto il punto
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Divide il contatto unificato visualizzato nei singoli contatti"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Unisci"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Dividere il contatto unificato «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Dividere veramente questo contatto unificato? In questo modo verrà diviso "
-"nei singoli contatti di cui è composto."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Dividi"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Cronologia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostra"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversazione in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversazione con %s"
 
 # (ndt) domenica 01 ottobre 2007
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s secondo"
 msgstr[1] "%s secondi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minuti"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Durata della chiamata: %s. Terminata alle: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Oggi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ieri"
 
 # (ndt) domenica 01 ottobre 2007
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%d %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Qualsiasi ora"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Chi"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Qualsiasi cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Testo conversazioni"
 
 # (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Chiamate"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chiamate in arrivo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chiamate in uscita"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chiamate perse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Eliminare veramente tutte le registrazioni delle conversazioni precedenti?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Elimina tutto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Elimina da:"
 
@@ -2595,7 +2561,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -2607,37 +2573,84 @@ msgstr "_File"
 msgid "page 2"
 msgstr "page 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ID contatto:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Il contatto è fuori rete"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Conversazione"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Il contatto specificato non è valido o non è conosciuto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Il contatto non supporta questo tipo di conversazione"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "La funzionalità richiesta non è implementata per questo protocollo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Impossibile iniziare una conversazione con il contatto fornito"
+
+# (ndt) messa così per renderle asessuale
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Impossibile accedere a questo canale (ban)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Questo canale è pieno"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "È necessario essere invitati per entrare in questo canale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Impossibile continuare quando fuori rete"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Si è verificato un errore nell'iniziare la conversazione"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Inserire un identificatore di contatto o un numero di telefono:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nuova conversazione"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Invia _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "Chiamata _video"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "C_hiama"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Chiamata _audio"
 
 # (ndt) è il titolo del dialogo
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nuova chiamata"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autenticazione non riuscita per l'account <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2675,13 +2688,8 @@ msgstr "Fare clic per aggiungere questo stato tra i preferiti"
 msgid "Set status"
 msgstr "Imposta lo stato"
 
-# (ndt) come c'è scritto nel codice: this string sucks
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Imposta la presenza e lo stato"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Messaggi personalizzati..."
 
@@ -2689,7 +2697,7 @@ msgstr "Messaggi personalizzati..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nuovo account %s"
@@ -2760,12 +2768,12 @@ msgid "Edit Custom Messages"
 msgstr "Modifica messaggi personalizzati"
 
 # (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile...
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Messaggio modificato alle %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normale"
 
@@ -2845,35 +2853,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome host del certificato: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continua"
+msgid "C_ontinue"
+msgstr "C_ontinua"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Connessione non sicura"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Questa connessione non è sicura. Continuare in ogni caso?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Ricordare per le successive connessioni"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Dettagli certificato"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Impossibile aprire l'URI"
 
 # (ndt) titolo
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Spazio insufficiente per salvare il file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2882,7 +2894,7 @@ msgstr ""
 "%s di spazio libero sono richiesti per salvare questo file, ma sono "
 "disponibili solamente %s. Scegliere un'altra posizione."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "File in arrivo da parte di %s"
@@ -3055,41 +3067,33 @@ msgstr "Occidentale"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Il contatto selezionato non può ricevere file."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Il contatto selezionato è fuori rete."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nessun messaggio di errore"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Messaggio istantaneo (Empathy)"
 
 # (ndt) opzione
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Non connettere all'avvio"
 
 # (ndt) opzione
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Messaggistica istantanea Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Errore nel contattare il gestore di account"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3135,245 +3139,96 @@ msgstr ""
 "questo programma. In caso contrario scrivere a: Free Software Foundation, "
 "Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client di messaggistica istantanea per GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Milo Casagrande <milo@ubuntu.com>\n"
 "Michele Baldessari\n"
 "Fabio Bonelli"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Si è verificato un errore durante l'importazione degli account."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr ""
-"Si è verificato un errore durante l'analisi dei dettagli degli account."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Si è verificato un errore durante la creazione dell'account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Si è verificato un errore."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Il messaggio di errore è stato: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"È possibile tornare indietro e provare a inserire i dettagli degli account "
-"nuovamente oppure chiudere questo assistente e aggiungere gli account in un "
-"secondo momento dal menù «Modifica»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Si è verificato un errore"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Che tipo di account è disponibile?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Sono disponibili altri account da configurare?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Inserire i dettagli dell'account"
-
-# (ndt) tolto chat volutamente
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Che tipo di account creare?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Creare altri account?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Inserire i dettagli del nuovo account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy è possibile conversare con le persone che ci circondano, con "
-"amici e colleghi che usano Google Talk, AIM, Windows Live e molti altri "
-"programmi di messaggistica. Con un microfono o una videocamera è anche "
-"possibile effettuare chiamate audio o video."
-
-# (ndt) non so perché si ostinano a usare chat...
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"È disponibile un account usato con un altro programma di messaggistica?"
-
-# (ndt) dopo di questa c'è un elenco a discesa...
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Sì, importare gli account da "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Sì, inserire i dettagli dell'account ora"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, creare un nuovo account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, visualizzare solo le persone nelle vicinanze"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Selezionare gli account da importare:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Sì"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "No, per ora è tutto"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"È possibile scoprire e avere conversazioni automaticamente con le persone "
-"collegate sulla stessa rete in cui ci si trova. Per utilizzare questa "
-"caratteristica, assicurarsi che i dettagli sottostanti siano corretti. È "
-"comunque possibile modificare in seguito questi dettagli o disabilitare "
-"questa funzionalità attraverso il dialogo «Account»."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Modifica → Account"
-
-# (ndt) checkbutton
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "No_n abilitare ora questa funzionalità"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Non è possibile avere conversazioni con le persone collegate alla stessa "
-"rete locale poiché il pacchetto «telepathy-salut» non è installato. Per "
-"abilitare questa funzionalità, installare il pacchetto «telepathy-salut» e "
-"creare un account «Persone nelle vicinanze» attraverso il dialogo «Account»."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Il pacchetto «telepathy-salut» non è installato"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistente per account di messaggistica e VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Benvenuti in Empathy"
-
-# (ndt) titolo dialogo assistente
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importazione account"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Inserire i dettagli personali"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Sono presenti delle modifiche non salvate per l'account %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Il nuovo account non è ancora stato salvato."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Connessione..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Fuori rete — %s"
 
 # (ndt) plurale per comprendere uomini e donne
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnessi — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Fuori rete — Nessuna connessione di rete"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Questo account è stato disabilitato poiché utiliza un backend datato e non "
+"supportato. Installare «telepathy-haze» e riavviare la sessione o migrare "
+"l'account."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Fuori rete — Account disabilitato"
 
-# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Sta per essere creato un nuovo account e le modifiche\n"
-"effettuate verranno scartate. Procedere veramente?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Modifica parametri connessione"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Impossibile recuperare le informazioni personali dal server."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Andare in rete per modificare le informazioni personali."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Modifica parametri connessione..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Rimuovere «%s» dal computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Questo non rimuoverà l'account dal server."
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3382,16 +3237,24 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Abilita"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Disabilita"
 
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Salta"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Connetti"
+
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3408,15 +3271,11 @@ msgid "Loading account information"
 msgstr "Caricamento informazioni account"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
+msgid "No protocol backends installed"
 msgstr "Nessun protocollo installato"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocollo:"
-
 # FIXME: backend, ci vuole di meglio
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3424,134 +3283,118 @@ msgstr ""
 "Per aggiungere un nuovo account è necessario installare un backend per ogni "
 "protocollo da usare."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Importa..."
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Client autenticazione Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Client autenticazione Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Persone nelle vicinanze"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client audio/video Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Client audio/video Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Barra laterale"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Ingresso audio"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Ingresso video"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Tastierino"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Dettagli"
 
 # (ndt) quello che c'è dopo è il nome del contatto
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Chiamata con %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "L'indirizzo IP visto dal computer"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'indirizzo IP visto da un server su Internet"
 
 # (ndt) il lato oscuro... questa è interessante e da rivedere
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'indirizzo IP del nodo visto dall'altro lato"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "L'indirizzo IP di un relay server"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "L'indirizzo IP del gruppo multicast"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connessi — %d.%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Dettagli tecnici"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3560,8 +3403,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati audio "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3570,8 +3413,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati video "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3580,27 +3423,27 @@ msgstr ""
 "Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
 "una rete che non supporta connessioni dirette."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Si è verificato un problema sulla rete"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "I formati audio necessari per eseguire la chiamata non sono installati"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "I formati video necessari per eseguire la chiamata non sono installati"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3611,23 +3454,23 @@ msgstr ""
 "\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
 "attraverso l'azione «Debug» presente nel menù «Aiuto»."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Si è verificato un problema nel motore delle chiamate"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Raggiunta la fine del flusso"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Impossibile stabilire il flusso audio"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Impossibile stabilire il flusso video"
 
@@ -3723,8 +3566,8 @@ msgstr "Abilita/Disabilita la trasmissione video"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -3743,17 +3586,17 @@ msgid "_Camera"
 msgstr "Video_camera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Sommario"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "A_iuto"
 
@@ -3766,51 +3609,98 @@ msgid "_Settings"
 msgstr "Imposta_zioni"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Chiudere la finestra?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Chiudendo questa finestra, il canale %s verrà abbandonato. Per ricevere "
+"nuovi messaggi, entrare nuovamente nel canale."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Chiudendo questa finestra verrà abbandonata una stanza di conversazione. Per "
+"ricevere nuovi messaggi, entrare nuovamente nella stanza."
+msgstr[1] ""
+"Chiudendo questa finestra verranno abbandonate %u stanze di conversazione. "
+"Per ricevere nuovi messaggi, entrare nuovamente nelle stanze."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Uscire da %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Per ricevere nuovi messaggi, entrare nuovamente nella stanza."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Chiudi finestra"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Lascia stanza"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non letto)"
 msgstr[1] "%s (%d non letti)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u altro)"
 msgstr[1] "%s (e %u altri)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non letto da altri)"
 msgstr[1] "%s (%d non letti da altri)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non letto da tutti)"
 msgstr[1] "%s (%d non letti da tutti)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Invio di %d messaggio in corso"
 msgstr[1] "Invio di %d messaggi in corso"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Scrittura messaggio."
 
@@ -3893,98 +3783,98 @@ msgstr "Connessione automatica"
 msgid "Manage Favorite Rooms"
 msgstr "Gestione stanze preferite"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Chiamata video in arrivo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s sta video-chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s sta chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chiamata in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Ri_fiuta"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Rispondi"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Rispondi con _video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Chiamata video in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invito in una stanza"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s sta inviando un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Rifiuta"
 
 # (ndt) pulsante
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "C'è un invito per entrare in %2$s da parte di %1$s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "C'è un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Trasferimento file in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Password richiesta"
 
 # (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale...
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vorrebbe poter visualizzare la tua presenza in rete"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3994,105 +3884,105 @@ msgstr ""
 "Messaggio: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u.%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s di %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s di %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Ricezione del file «%s» da %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Invio del file «%s» a %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errore nel ricevere il file «%s» da %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Errore nel ricevere un file"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errore nell'inviare il file «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Errore nell'inviare un file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "File «%s» ricevuto da %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "File «%s» inviato a %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Attesa della risposta dell'altro utente"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verifica dell'integrità del file «%s»"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Calcolo codice di controllo di «%s»"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restante"
 
@@ -4107,7 +3997,12 @@ msgstr ""
 "Rimuove dall'elenco i trasferimenti di file completati, annullati e non "
 "riusciti"
 
-#: ../src/empathy-import-dialog.c:84
+# (ndt) nome di una colonna
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importa"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4116,185 +4011,212 @@ msgstr ""
 "importare gli account solamente da Pidgin."
 
 # (ndt) titolo
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importa account"
 
 # (ndt) nome di una colonna
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Sorgente"
 
 # (ndt) pare tooltip... mah...
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Fornisce password"
 
 # (ndt) tooltip
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Disconnette"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "È necessario configurare un account per poter visualizzare i contatti."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nessun risultato"
 
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"L'account «%s» non può essere utilizzato fino all'aggiornamento del software "
+"«%s»."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Aggiorna software..."
+
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Chiude"
+
+# (ndt) suggerimento
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Riconnette"
 
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Modifica account"
 
-# (ndt) suggerimento
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Chiude"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Ricarica di %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Ricarica account"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Ricarica..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"È necessario abilitare uno degli account per poter visualizzare i contatti."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "È necessario abilitare «%s» per poter visualizzare i contatti."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Elenco contatti"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Impostazioni account"
+
 # (ndt) è una voce del menù visualizza
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contatti sulla _mappa"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Saldo crediti"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Trova in E_lenco contatti"
 
 # (ndt) voce di menù, stanze
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Entra nelle pre_ferite"
 
 # (ndt) stanze
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gestisci preferite"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Dimensione nor_male"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nuova c_hiamata..."
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Dimensione normale con imm_agini"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Preferen_ze"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Mostrare p_rotocolli"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordinare per _nome"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordinare per s_tato"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contatti _bloccati"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Dimensione ridotta"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Trasferimenti _file"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Entra..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nuova conversazione..."
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "C_ontatti fuori rete"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Informazioni _personali"
-
 # (ndt) voce di menù per accedere alle opzioni relative ai canali IRC
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "St_anza"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Cerca contatti..."
 
 # (ndt) pare il titolo di una colonna
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Stanza"
 
 # (ndt) titolo scheda
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membri"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4307,16 +4229,21 @@ msgstr ""
 "Password richiesta: %s\n"
 "Membri: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sì"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Impossibile recuperare l'elenco delle stanze"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Impossibile bloccare il recupero dell'elenco delle stanze"
 
@@ -4353,79 +4280,79 @@ msgstr "Stan_za:"
 
 # (ndt) quelli che seguono sono
 # messaggi di eventi a cui associare un suono
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nuova conversazione"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Il contatto entra in rete"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Il contatto va fuori rete"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Account connesso"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Account disconnesso"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Lingua"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Giulietta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, perché sei tu Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Rinnega tuo padre e rifiuta il tuo nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "o, se non vuoi, legati solo in giuramento all'amor mio"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "e io non sarò più una Capuleti."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Starò ancora ad ascoltare, o rispondo a questo che ha detto?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "L'utente Giulietta si è disconnesso"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -4489,37 +4416,29 @@ msgstr "Abilitare il controllo ortografico per le lingue:"
 msgid "General"
 msgstr "Generale"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Livello di ingresso:"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Volume di ingresso:"
-
 # (ndt) nome di una sezione
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location sources:"
 msgstr "Sorgenti per la posizione:"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Registrare le conversazioni"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Riprodurre un suono per gli eventi"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4530,26 +4449,30 @@ msgstr ""
 "precisione delle coordinate GPS sarà di una posizione decimale."
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Mostrare le faccin_e come immagini"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Mostrare l'e_lenco contatti nelle stanze"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Suoni"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Avvia conversazioni in:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4558,61 +4481,64 @@ msgstr ""
 "installato."
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temi"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr ""
 "Usare la soppressione dell'_eco per migliorare la qualità della chiamata"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "C_onnettere automaticamente all'avvio"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "C_ellulare"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Abilitar_e le notifiche visive"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Abilitar_e le notifiche sonore"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rete (IP, WiFi)"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "A_prire finestre separate per le nuove conversazioni"
-
-# (ndt) opzione
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Pubblicare la posizione geografica ai propri contatti"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Ridurre la precisione della posizione geografica"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nuove _finestre"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "nuove _schede"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Stato"
@@ -4674,67 +4600,88 @@ msgid "Video Preview"
 msgstr "Anteprima"
 
 # (ndt) questo è il titolo della finestra che mostra la mappa... molto libera
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mappa posizioni dei contatti"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Collegamento Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Risposta Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Troppi dati per una singola operazione. Salvare i registri su file."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Invia a Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Livello "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informazioni"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Orario"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Livello"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4742,26 +4689,26 @@ msgstr ""
 "Il gestore di connessione selezionato non sembra supportare l'estensione per "
 "il debug remoto."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invita partecipante"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Scegliere un contatto da invitare nella conversazione:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invita"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Non visualizza alcun dialogo, esegue qualsiasi operazione (come "
 "l'importazione) ed esce"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
@@ -4769,104 +4716,415 @@ msgstr ""
 "vicinanze\""
 
 # (ndt) spero che una cosa così non si veda mai...
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Seleziona l'account fornito (per esempio gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Account Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Account Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Mostra un servizio particolare"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Debugger Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Debugger Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Client chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Rispondi con video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Accetta"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Fornisce"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "In attesa"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Muto"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Durata"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d.%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Il saldo attuale è di %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Saldo non sufficiente per effettuare la chiamata."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Ricarica"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Maiuscole/minuscole"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Che tipo di account è disponibile?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Aggiunta nuovo account"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Persone nelle vicinanze"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"È possibile scoprire e avere conversazioni automaticamente con le persone "
+"collegate sulla stessa rete in cui ci si trova. Per utilizzare questa "
+"funzionalità, assicurarsi che i dettagli sottostanti siano corretti."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"La modifica dei dettagli può essere effettuata anche in un secondo momento o "
+"è possibile disabilitare questa funzionalità scegliendo <span style=\"italic"
+"\">Modifica → Account</span> dall'elenco dei contatti."
+
+#~ msgid "Call volume"
+#~ msgstr "Volume chiamata"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume della chiamata in percentuale."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr ""
+#~ "Indica se il programma ha eseguito la migrazione dei registri di butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Tipo di socket non supportato"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Account online"
+
+# (ndt) idee su dove/cosa sia My Web Accounts?
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "L'account %s viene modificato attraverso «%s»."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "L'account %s non può essere modificato utilizzando il programma."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Lancia «Account online»"
+
+#~ msgid "Edit %s"
+#~ msgstr "Modifica %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "A_nnulla"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informazioni personali"
+
+# (ndt) inteso come "contatti"
+#~ msgid "Ungrouped"
+#~ msgstr "Non raggruppati"
+
+# (ndt) inteso come "contatti"
+#~ msgid "Favorite People"
+#~ msgstr "Preferiti"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Modifica"
+
+#~ msgid "Select a contact"
+#~ msgstr "Seleziona un contatto"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Selezionare i contatti da unire"
+
+#~ msgid "New contact preview"
+#~ msgstr "Anteprima nuovo contatto"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Unisci contatti..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Unisci contatti"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Dividi..."
+
+# (ndt) suggerimento, tolto il punto
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Divide il contatto unificato visualizzato nei singoli contatti"
+
+#~ msgid "_Link"
+#~ msgstr "_Unisci"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Dividere il contatto unificato «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Dividere veramente questo contatto unificato? In questo modo verrà diviso "
+#~ "nei singoli contatti di cui è composto."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Dividi"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ID contatto:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Conversazione"
+
+#~ msgid "Send _Video"
+#~ msgstr "Invia _video"
+
+#~ msgid "C_all"
+#~ msgstr "C_hiama"
+
+# (ndt) come c'è scritto nel codice: this string sucks
+#~ msgid "Set your presence and current status"
+#~ msgstr "Imposta la presenza e lo stato"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Il contatto selezionato non può ricevere file."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Il contatto selezionato è fuori rete."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Si è verificato un errore durante l'importazione degli account."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr ""
+#~ "Si è verificato un errore durante l'analisi dei dettagli degli account."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Si è verificato un errore durante la creazione dell'account."
+
+#~ msgid "There was an error."
+#~ msgstr "Si è verificato un errore."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Il messaggio di errore è stato: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "È possibile tornare indietro e provare a inserire i dettagli degli "
+#~ "account nuovamente oppure chiudere questo assistente e aggiungere gli "
+#~ "account in un secondo momento dal menù «Modifica»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Si è verificato un errore"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Sono disponibili altri account da configurare?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Inserire i dettagli dell'account"
+
+# (ndt) tolto chat volutamente
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Che tipo di account creare?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Creare altri account?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Inserire i dettagli del nuovo account"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy è possibile conversare con le persone che ci circondano, con "
+#~ "amici e colleghi che usano Google Talk, AIM, Windows Live e molti altri "
+#~ "programmi di messaggistica. Con un microfono o una videocamera è anche "
+#~ "possibile effettuare chiamate audio o video."
+
+# (ndt) non so perché si ostinano a usare chat...
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "È disponibile un account usato con un altro programma di messaggistica?"
+
+# (ndt) dopo di questa c'è un elenco a discesa...
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sì, importare gli account da "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sì, inserire i dettagli dell'account ora"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, creare un nuovo account"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, visualizzare solo le persone nelle vicinanze"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Selezionare gli account da importare:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, per ora è tutto"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Modifica → Account"
+
+# (ndt) checkbutton
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "No_n abilitare ora questa funzionalità"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Non è possibile avere conversazioni con le persone collegate alla stessa "
+#~ "rete locale poiché il pacchetto «telepathy-salut» non è installato. Per "
+#~ "abilitare questa funzionalità, installare il pacchetto «telepathy-salut» "
+#~ "e creare un account «Persone nelle vicinanze» attraverso il dialogo "
+#~ "«Account»."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Assistente per account di messaggistica e VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Benvenuti in Empathy"
+
+# (ndt) titolo dialogo assistente
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importazione account"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Inserire i dettagli personali"
+
+# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Sta per essere creato un nuovo account e le modifiche\n"
+#~ "effettuate verranno scartate. Procedere veramente?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocollo:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Informazioni _personali"
+
+#~ msgid "Input level:"
+#~ msgstr "Livello di ingresso:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Volume di ingresso:"
+
+# (ndt) opzione
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_prire finestre separate per le nuove conversazioni"
diff --git a/po/ja.po b/po/ja.po
index 6da82ec74..51752cf95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
 # empathy ja.po.
-# Copyright (C) 2007-2011 empathy's COPYRIGHT HOLDER
+# Copyright (C) 2007-2012 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2007-2009.
 # Kentaro Kazuhama <kazken3@gmail.com>, 2009.
@@ -7,26 +7,41 @@
 # (Contributed to Moblin by Intel GLS)
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2010.
+# Mako N <mako@pasero.net>, 2012.
 #
 # GLOSSARIES:
-#  contact list: 仲間リスト
-#  contact:      仲間
-#  away:         離席
-#  log(s) in:    サインイン
-#  log(s) out:   サインアウト
-#  chat room:    �ャット部屋
-#  chat window:  �ャットウィンドウ
-#  nick:         ニック�ーム
-#  nickname:     ニック�ーム
+# call	通話�呼�出��呼�出�
+# choose	��
+# select	指定�る
+# contact	相手先
+# contact list	相手先�一覧
+# metacontact	メタ相手先
+# chat	�ャット
+# conversation	会話
+# chat room	談話室
+# room	談話室
+# text	文字
+# audio	音声
+# video	ビデオ�映�
+# identifier	�称
+# status	在席状�
+# People Nearby	(訳���)
+# geolocation	�置情報
+# location	場所
+#
+# nick:    ニック�ーム
+# nickname:   ニック�ーム
+# log(s) in:    サインイン
+# log(s) out:   サインアウト
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-16 12:29+0000\n"
-"PO-Revision-Date: 2011-09-11 00:28+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
+"POT-Creation-Date: 2012-02-08 14:20+0000\n"
+"PO-Revision-Date: 2012-02-08 20:43+0900\n"
+"Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,698 +50,680 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Googleトーク�Facebook�MSN や他�多���ャットサービス��ャット"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "インスタントメッセンジャー・クライアント"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Empathy インスタント・メッセンジャー"
+msgstr "Empathy インスタントメッセージング"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "インスタント・メッセンジャー クライアント"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Googleトーク�Facebook�MSN や他�多���ャットサービス��ャット"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "新���ャット用�別��ャットウィンドウを常�開���。"
+msgid "Connection managers should be used"
+msgstr "接続マ�ージャーを利用�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
+"自動的�切断/�接続�る��接続マ�ージャーを利用�������を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "起動時�自動接続�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera device"
-msgstr "カメラ入"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Empathy を起動��ら自動的�自分�アカウント�サインイン�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera position"
-msgstr "カメラ入"
+msgid "Empathy should auto-away when idle"
+msgstr "アイドル時�自動的�離席中��る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"グループ・�ャット�ニック�ームを補完(tab)��際��ニック�ーム�後��追加"
-"�る文字��。"
+"ユーザー�アイドル状態����ら�Empathy �自動的�離席中�モード��る��"
+"����。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "�ャットウィンドウ�テーマ"
+msgid "Empathy default download folder"
+msgstr "Empathy �使�デフォルト�ダウンロード・フォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "Chat window theme"
-msgid "Chat window theme variant"
-msgstr "�ャットウィンドウ�テーマ"
+msgid "The default folder to save file transfers in."
+msgstr "転���ファイルを�存�るデフォルト�フォルダー��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"スペルを�ェック�る言語をコンマ�区切��指定��� (例: \"en, fr, nl\")。"
+msgid "Show offline contacts"
+msgstr "オフライン�相手先を表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "仲間リストを����る����"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "相手先�一覧�中�オフライン�相手先を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "接続マ�ージャーを利用�る����"
+msgid "Show avatars"
+msgstr "ア�ターを表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "仲間リストを並�替�る際��件"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"相手先�一覧��ャットウィンドウ�中�相手先�ア�ターを表示�る�����"
+"�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
+msgid "Show protocols"
+msgstr "プロトコルを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ア�ター�画��格��れ�デフォルト�フォルダー"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "相手先�一覧�中�相手先�プロトコルを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "離席中����も�ップアップ通知�������"
+#, fuzzy
+msgid "Show Balance in contact list"
+msgstr "相手先�一覧をコンパクト��る(_M)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "離席中����らサウンド�演�を無効��る����"
+#, fuzzy
+msgid "Whether to show account balances in the contact list."
+msgstr "相手先�一覧�中�相手先�プロトコルを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "�信��イベントを表示"
+msgid "Compact contact list"
+msgstr "相手先�一覧を����る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"�信��イベントを通知領域�表示���。も� false �ら�ユーザー����通知"
-"���。"
+msgid "Whether to show the contact list in compact mode."
+msgstr "相手先�一覧を���表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr ""
+msgid "Hide main window"
+msgstr "メインウィンドウを隠�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy�ユーザー�場所�公開を�能��る"
+msgid "Hide the main window."
+msgstr "メインウィンドウを隠�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy�場所�推測�GPSを利用�る��を�能��る"
+msgid "Default directory to select an avatar image from"
+msgstr "ア�ター�画��格��れ�デフォルト�フォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy�場所�推測�セルラー�ットワークを利用�る��を�能��る"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "最後�ア�ターを�択��時�使用��フォルダー��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy�場所�推測��ットワークを利用�る��を�能��る"
+msgid "Open new chats in separate windows"
+msgstr "新���ャット���ウィンドウを開�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy �使�デフォルト�ダウンロード・フォルダー"
+msgid "Always open a separate chat window for new chats."
+msgstr "常�新���ャット���別��ャットウィンドウを開���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy � butterfly �ログを移行����"
+msgid "Display incoming events in the status area"
+msgstr "�信��イベントを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "アイドル時�自動的�離席�る����"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"�信��イベントを通知領域�表示���。も� false �ら�ユーザー����通知"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "起動時�自動接続�る����"
+msgid "The position for the chat window side pane"
+msgstr "�ャットウィンドウ�横�ペイン��置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy�場所�精度を下�る����"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "�存�れ��ャットウィンドウ�横�ペイン��置 (ピクセル��)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "仲間リスト�ア�ターを�ャットウィンドウ�アイコン��る����"
+msgid "Contact list sort criterion"
+msgstr "相手先�一覧を並�替�る際��件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer Toolsを有効��る"
+#, fuzzy
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"相手先�一覧�中�相手先を並�替�る際����件を使用�る�。デフォルト�相"
+"手先��� (\"name\") ��。\"state\" ��相手先�状態�相手先�一覧を並�替"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "メッセージを�信��ら�ップアップ�通知�る����"
+msgid "Use notification sounds"
+msgstr "通知�サウンドを使�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "スペルを�ェック�る����"
+msgid "Whether to play a sound to notify of events."
+msgstr "イベント�発生��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "メイン・ウィンドウを隠�����"
+msgid "Disable sounds when away"
+msgstr "離席中����サウンドを鳴ら���"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "メイン・ウィンドウを隠�������。"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "離席中����り込�中����サウンド通知を行�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ニックを補完�る文字"
+msgid "Play a sound for incoming messages"
+msgstr "メッセージを�信��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "新��会話毎�ウィンドウを開�����"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "メッセージを�����らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "使用�る Adium テーマ�パス"
+msgid "Play a sound for outgoing messages"
+msgstr "メッセージを�信��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"会話�使用�るテーマ� Adium �場��使用�る Adium テーマ�パスを指定��"
-"�。"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "メッセージを�信��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "メッセージを�信��らサウンドを演��る����"
+msgid "Play a sound for new conversations"
+msgstr "�ャット�新��会話を��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "�ャット�新��会話を��らサウンドを演��る����"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "新��会話を開始��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "メッセージを�信��らサウンドを演��る����"
+msgid "Play a sound when a contact logs in"
+msgstr "相手先�サインイン��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "仲間�サインイン��らサウンドを演��る����"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"相手先�サインイン����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
-msgstr "仲間�サインアウト��らサウンドを演��る����"
+msgstr "相手先�サインアウト��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "サインイン��らサウンドを演��る����"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"相手先�サインアウト����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "サインアウト��らサウンドを演��る����"
+msgid "Play a sound when we log in"
+msgstr "サインイン��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"�ャット・ウィンドウ�フォーカス�当������場���ップアップ通知�る"
+msgid "Whether to play a sound when logging into a network."
+msgstr "�ットワーク�サインイン��らサウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "仲間�サインイン��際��ップアップ通知"
+msgid "Play a sound when we log out"
+msgstr "サインアウト��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "仲間�サインアウト��際��ップアップ通知"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "�ットワーク�らサインアウト��らサウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Enable popup notifications for new messages"
+msgstr "メッセージを�信��ら�ップアップ�通知�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Show co_mpact contact list"
-msgid "Show Balance in contact list"
-msgstr "仲間リストをコンパクト��る(_M)"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "新��メッセージを�信�る際���ップアップ通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "ア�ターを表示�る����"
+msgid "Disable popup notifications when away"
+msgstr "離席中�����ップアップ通知���"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "部屋�仲間�一覧を表示�る����"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "離席中����り込�中�����ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "メイン・ウィンドウを閉�る際�ヒントを表示�る����"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"�ャットウィンドウ�フォーカス�当������場���ップアップ通知�る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "オフライン�仲間を表示�る����"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"�ャットウィンドウ�開����もフォーカス�当������場��新��メッ"
+"セージを�信�る際��ップアップ通知を行�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "プロトコルを表示"
+msgid "Pop up notifications when a contact logs in"
+msgstr "相手先�サインイン��際��ップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "スペルを�ェック�る言語"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "相手先�オンライン����際��ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "転���ファイルを�存�るデフォルト�フォルダー��。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "相手先�サインアウト��際��ップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "最後�ア�ターを�択��時�使用��フォルダー��。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "相手先�オフライン����際��ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "�ャットウィンドウ�横�ペイン��置"
+msgid "Use graphical smileys"
+msgstr "スマイリー・アイコンを使�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "�存�れ��ャットウィンドウ�横�ペイン��置 (ピクセル��)"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "会話中�スマイリーをグラフィカル�画��変��る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "�ャットウィンドウ�使用�るテーマ��。"
+msgid "Show contact list in rooms"
+msgstr "談話室�相手先�一覧を表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "�ャットウィンドウ�使用�るテーマ��。"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "談話室�相手先�一覧を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "スマイリー・アイコンを使�����"
+msgid "Chat window theme"
+msgstr "�ャットウィンドウ�テーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "状態をサウンド�演��通知�る����"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "�ャットウィンドウ�使用�るテーマ��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "�ャットルーム�テーマを�用�る����"
+#, fuzzy
+msgid "Chat window theme variant"
+msgstr "�ャットウィンドウ�テーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy�仲間�場所を公開�る����を設定���。"
+#, fuzzy
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�ャットウィンドウ�使用�るテーマ��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy�GPS�場所を推測�る����を設定���。"
+msgid "Path of the Adium theme to use"
+msgstr "使用�る Adium テーマ�パス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy�セルラー�ットワーク�場所を推測�る����を設定���。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"�ャット�使用�るテーマ� Adium �場��使用�る Adium テーマ�パスを指定�"
+"��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy��ットワーク�場所を推測�る����を設定���。"
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer Tools を有効��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy � butterfly �ログを移行������。"
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspector �よ�� WebKit developer tools を有効��る����。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Empathy を起動��ら自動的�自分�アカウント�サインイン�る������。"
+msgid "Use theme for chat rooms"
+msgstr "談話室�テーマを�用�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "アイドル状態����ら�Empathy �自動的�離席�る������。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "談話室�テーマを使用�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy�プライ�シー��由�場所�精度を下�る����を設定���。"
+msgid "Spell checking languages"
+msgstr "スペルを�ェック�る言語"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Empathy �仲間�ア�ターを�ャットウィンドウ�アイコン���利用�る����"
-"��。"
+"スペルを�ェック�る言語をコンマ�区切��指定��� (例: \"en, fr, nl\")。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Web Inspector�よ��WebKit developer toolsを有効��る����。"
+msgid "Enable spell checker"
+msgstr "スペルを�ェック�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"自動的�切断/�接続�る��接続マ�ージャーを利用�������を設定���。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "指定��言語�入力���語を�ェック�る������。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "ニック�ームを補完�る文字"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "会話中�スマイリーをグラフィカル�画��変��る������。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"グループ�ャット�ニック�ームを補完(tab)��際��ニック�ーム�後��追加�"
+"る文字��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "相手先�一覧�ア�ターを�ャットウィンドウ�アイコン��る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"仲間�サインイン����を通知�る���サウンドを�生�る������。"
+"Empathy �相手先�ア�ターを�ャットウィンドウ�アイコン���利用�る���"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Last account selected in Join Room dialog"
 msgstr ""
-"仲間�サインアウト����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "イベント�発生��らサウンドを�生��通知�る������。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "メッセージを�����らサウンドを�生��通知�る������。"
+msgid "Camera device"
+msgstr "カメラデ�イス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "新��会話を開始��らサウンドを�生��通知�る������。"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ビデオ通話�使用�るデフォルト�カメラデ�イス。���� /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "メッセージを�信��らサウンドを�生��通知�る������。"
+msgid "Camera position"
+msgstr "カメラ��置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "�ットワーク�サインイン��らサウンドを�生�る������。"
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "�ットワーク�らサインアウト��らサウンドを�生�る������。"
+msgid "Echo cancellation support"
+msgstr "エコー除去�サ�ート"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "離席中���多忙����らサウンド��生�よる通知を行�������。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio �エコー除去フィルターを有効��る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"仲間�オフライン����際��ップアップ��通知を表示�る������。"
+msgid "Show hint about closing the main window"
+msgstr "メインウィンドウを閉�る際�ヒントを表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"仲間�オンライン����際��ップアップ��通知を表示�る������。"
+"タイトル�ー��る 'x' ボタンをクリック��メインウィンドウを閉��らメッセー"
+"ジ・ダイアログを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"�ャット・ウィンドウ�開����もフォーカス�当������れ��新��メッ"
-"セージを�信�る度��ップアップ通知を行�������。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy �ユーザー�場所�公開を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "新��メッセージを�信�る度��ップアップ通知�る������。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy �相手先�場所を公開�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-#, fuzzy
-#| msgid "Whether to show protocols for contacts in the contact list."
-msgid "Whether to show account balances in the contact list."
-msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy �場所�推測��ットワークを利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"仲間リスト��ャットウィンドウ�中�仲間�ア�ターを表示�る������。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy ��ットワーク�場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "仲間リスト�中�オフライン�仲間を表示�る������。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy �場所�推測�セルラー�ットワークを利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"状態�離席中���多忙����も�ップアップ通知を表示�る������。"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy �セルラー�ットワーク�場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy �場所�推測� GPS を利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "�ャットルーム�仲間リストを表示�る������。"
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy � GPS �場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "仲間リストを���表示�る������。"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy �場所�精度を下�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"タイトル�ー��る 'x' ボタンをクリック��メインウィンドウを閉��らメッセー"
-"ジ・ダイアログを表示�る������。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "�ャットルーム�テーマを使用�る������。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"仲間リスト�中�仲間を並�替�る際����件を使用�る�。デフォルト�仲間�"
-"�� (\"name\") ��。\"state\" ��仲間�状態�仲間リストを並�替���。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy �プライ�シー��由�場所�精度を下�る����を設定���。"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "メッセージング� VoIP �アカウント"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "メッセージング� VoIP �アカウント�管�"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "メッセージング� VoIP �アカウント"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "原因�特定�れ����ん"
 
-#: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "状態�変更を�求�れ���"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ファイル転�をキャンセル����"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "他�相手先�ファイル転�をキャンセル����"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ファイル�転�中�エラー�発生����"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "他�相手先�ファイル転�����ん���"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "原因�明��"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
-msgstr "ファイル�転��完了����"
+msgstr "ファイル�転��完了����。���ファイル�壊れ����"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "リモート��相手�ファイル転�をサ�ート�����ん。"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "�択��ファイル�一般的�ファイル���り��ん"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "�択�れ�ファイル�空��"
 
 #: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Missed call from %s"
-msgstr "%s �ん�ら�呼�出���"
+msgstr "%s �ん�ら�失敗��通話"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
 #: ../libempathy/empathy-message.c:419
 #, fuzzy, c-format
-#| msgid "Call with %s"
 msgid "Called %s"
-msgstr "%s�発信"
+msgstr "%s �ん��通話"
 
 #: ../libempathy/empathy-message.c:422
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Call from %s"
-msgstr "%s �ん�ら�呼�出���"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "サ�ート�れ����ソケットタイプ��"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "原因�特定�れ����ん"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "状態�変更を�求�れ���"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ファイル転�をキャンセル����"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "他�仲間�ファイル転�をキャンセル����"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ファイル�転�中�エラー�発生����"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "他�仲間�ファイル転�����ん���"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "原因�明��"
+msgstr "%s �ん�ら�通話"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在席中"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "�り込�中"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離席中"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
-msgstr "�表示"
+msgstr "隠れ中"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "オフライン"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
-#, fuzzy
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "原因�特定�れ����ん"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "状態�オフライン�設定�れ����"
+msgstr "在席状��オフライン�設定�れ����"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "�ットワーク�エラー��"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�証�失敗����"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "暗�化�エラー��"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "使用中���"
+msgstr "���使用中��"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "証明書��り��ん"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "信用���証明書��"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "証明書�有効期��切れ����"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "証明書�利用����ん"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "証明書�ホスト��一致���ん"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "証明書�指紋�一致���ん"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "証明書自身�署���"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "証明書�関連�るエラー��"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "暗��利用����ん"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "証明書�正���り��ん"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "接続�拒��れ���"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "接続を確立����ん���"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "接続�失�れ���"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "��リソース�既�サー�ー�接続済���"
+#: ../libempathy/empathy-utils.c:355
+#, fuzzy
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "��リソース����サー�ー�接続済���"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "接続���リソースを使��新��接続�置���り���"
+msgstr "接続���リソースを使�新��接続�置���り���"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "アカウント�サー�ー�既�存在�����"
+msgstr "アカウント�サー�ー����存在�����"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "サー�ー���接続を処������ら��忙��状態��り��"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "証明書�無効化�れ���"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "証明書�安全���暗��アルゴリズムを使���る��暗�的�弱���"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -734,288 +731,260 @@ msgstr ""
 "サー�ー証明書�長�や�サー�ー証明書��ェイン�深��暗�ライブラリ��定"
 "�れ��る長�を越�����"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ソフトウェア������"
+
+#: ../libempathy/empathy-utils.c:375
+#, fuzzy
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "間隔 (秒)"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
-msgstr "��近���る人�"
+msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
-msgstr ""
+msgstr "Google トーク"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週間�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
-msgstr "アカウント"
+msgstr "����アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "サー�ー"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�ート番�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "My Web Accounts"
-msgstr "Empathy �アカウント"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "Launch My Web Accounts"
-msgstr "Empathy �アカウント"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, fuzzy, c-format
-#| msgid "_Edit"
-msgid "Edit %s"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ユーザー�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "�用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ログイン(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "��アカウント����サー�ー�存在���"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "サー�ー�新��アカウントを作る"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "中止(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ��る %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新��アカウント"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "パスワード(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "詳細"
+msgid "Screen _Name:"
+msgstr "スクリーン�(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "パスワードを記憶�る"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#, fuzzy
-#| msgid "Password"
-msgid "Remember Password"
-msgstr "パスワード"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "�ート番�(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "スクリーン�(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "サー�ー(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM�パスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "詳細"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr "AIM�スクリーン�ームを入力������"
+msgstr "AIM �スクリーン�ームを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "�ート番�(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM�パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "サー�ー(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "パスワードを記憶�る"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ログイン�(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-msgid "What is your GroupWise User ID?"
-msgstr "GroupWise�User IDを入力������"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例:</b> username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "GroupWise � User ID を入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
-msgstr "GroupWise�パスワードを入力������"
+msgstr "GroupWise �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ UIN(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "文字集�(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ UIN(_U):"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
-msgstr "ICQ UINを入力������"
+msgstr "ICQ UIN を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
-msgstr "ICQ�パスワードを入力������"
+msgstr "ICQ �パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:206
 #: ../libempathy-gtk/empathy-account-widget-sip.c:239
@@ -1050,23 +1019,30 @@ msgstr "Options"
 msgid "None"
 msgstr "��"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "�ットワーク"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "文字集�:"
+msgid "Network:"
+msgstr "�ットワーク:"
 
+# 元�語�よら��「文字エンコーディング��訳�(ヘルプ�対応�る項も�照)。
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
+msgid "Character set:"
+msgstr "文字エンコーディング:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "�ットワーク"
+msgid "Servers"
+msgstr "サー�ー"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "�ットワーク:"
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"����� IRC サー�ー���パスワード�����。��ら��れ��パスワード"
+"を入力��������。"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1084,48 +1060,20 @@ msgstr "終了時�メッセージ:"
 msgid "Real name:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "サー�ー"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "IRC �ニック�ーム�何���?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "�� IRC �ットワーク���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "TLS/SSL ��暗�化�必�(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL�証明書�関連�るエラー�無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "サー�ー�設定を上書��る"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "優先度(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "IRC �ニック�ーム�何���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "リソース(_U):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "���� Facebook �ユーザー��何���?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1139,178 +1087,202 @@ msgstr ""
 "�����������れ��<a href=\"http://www.facebook.com/username/\">�"
 "�ページ</a>を使�� Facebook �ユーザー�を�択������。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "�� SSL を使�(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "���� Facebook �パスワード�何���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "���� Facebook �ユーザー��何���?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
-msgstr "Google IDを入力������"
+msgstr "Google ID を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
-msgstr "Google�パスワードを入力������"
+msgstr "Google �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "What is your Jabber ID?"
-msgstr "Jabber IDを入力������"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例:</b> user@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Jabberパスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL �証明書�関連�るエラー�無視(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "優先度(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "リソース(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "TLS/SSL ��暗�化�必�(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "�� SSL を使�(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "サー�ー�設定を上書�"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your desired Jabber ID?"
-msgstr "希望�るJabber IDを入力������"
+msgid "What is your Jabber ID?"
+msgstr "Jabber ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "希望�る Jabber ID を入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Jabber パスワードを入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
-msgstr "希望�るJabberパスワードを入力������"
+msgstr "希望�る Jabber パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "���� Windows Live ID �何���?"
+msgstr "Windows Live ID を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Windows Live �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-メールアドレス(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "ニック�ーム(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "��(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公称(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "�字(_L):"
+msgid "E-_mail address:"
+msgstr "E-メールアドレス(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公称(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ユーザー�(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "�証用ユーザー�:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "�インディング�探索"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN サー�ーを自動的�探索�る"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr ""
+msgid "NAT Traversal Options"
+msgstr "NAT 超�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "間隔 (秒)"
+msgid "Proxy Options"
+msgstr "プロキシ�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive オプション"
+msgid "Miscellaneous Options"
+msgstr "��他�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "緩�ルーティング"
+msgid "STUN Server:"
+msgstr "STUN サー�ー:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "メカニズム:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN サー�ーを自動的�探索�る"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "��他�オプション"
+msgid "Discover Binding"
+msgstr "�インディング�探索"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 超�オプション"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "サー�ー:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "�ート番�:"
+msgid "Mechanism:"
+msgstr "メカニズム:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "プロキシ�オプション"
+msgid "Interval (seconds)"
+msgstr "間隔 (秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "�証用ユーザー�:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "トランス�ート:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN サー�ー:"
+msgid "Loose Routing"
+msgstr "緩�ルーティング"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "サー�ー:"
+msgid "Ignore TLS Errors"
+msgstr "TLS エラーを無視�る"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "トランス�ート:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "�ート番�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "SIPアカウント�パスワードを入力������"
+msgid "What is your SIP login ID?"
+msgstr "SIP �ログイン ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "SIP�ログインIDを入力������"
+msgid "What is your SIP account password?"
+msgstr "SIP アカウント�パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ユーザー�(_U):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! � ID(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
-msgstr "会議��ャットルーム��勧誘を無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "Yahoo! IDを入力������"
+msgstr "会議�談話室��招待を無視(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "Yahoo!�パスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "談話室�一覧��る場所(_R):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! � ID(_D):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "Yahoo! ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "部屋�一覧��る場所(_R):"
+msgid "What is your Yahoo! password?"
+msgstr "Yahoo! �パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
@@ -1322,10 +1294,8 @@ msgid "None of the accepted image formats are supported on your system"
 msgstr "�付られ�画��形����使��システム�サ�ート�れ����ん"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:819
-#, fuzzy
-#| msgid "Couldn't convert image"
 msgid "Couldn't save picture to file"
-msgstr "画�を変�����ん���"
+msgstr "画�をファイル��存����ん���"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
@@ -1352,105 +1322,100 @@ msgid "Click to enlarge"
 msgstr "クリック�る�大���り��"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
-#, fuzzy
-#| msgid "There was an error while creating the account."
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
-msgstr "アカウント�作�中�エラー�発生����。"
+msgstr "呼�出�中�エラー�発生����。"
 
 #: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "�択��相手先�通話をサ�ート�����ん"
 
 #: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "�択��仲間�オフライン��。"
+msgstr "�択��相手先�オフライン��"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "�択��仲間�オフライン��。"
+msgstr "�択��相手先�有効���り��ん"
 
 #: ../libempathy-gtk/empathy-call-utils.c:57
-#, fuzzy
-#| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "��会話��トピック�サ�ート�れ����ん"
+msgstr "��プロトコル�緊急呼�出�をサ�ート�����ん"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "��通話を行���クレジット��足�����"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "プライベート��ャットを開���ん���"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "��会話��トピック�サ�ート�れ����ん"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "トピック�変更�許��れ����ん"
 
 #: ../libempathy-gtk/empathy-chat.c:973
-#, fuzzy, c-format
-#| msgid "invalid contact"
+#, c-format
 msgid "“%s� is not a valid contact ID"
-msgstr "無効�仲間��"
+msgstr "“%s� �無効�相手先 ID ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �在�会話�ら����メッセージをクリア"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <トピック>: �在�会話�トピックを設定"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <�ャットルームID>: 新���ャットルーム��加"
+msgstr "/join <談話室ID>: 新��談話室��加"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <�ャットルームID>: 新���ャットルーム��加"
+msgstr "/j <談話室ID>: 新��談話室��加"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
-msgstr ""
+msgstr "/part [<談話室ID>] [<�由>]: 談話室(デフォルト���在�談話室)を退出"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <コンタクトID> [<メッセージ>]: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <コンタクトID> <メッセージ>: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ニック�ーム>: �在�サー�ー������ニック�ームを変更"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <メッセージ>: ACTION メッセージを�在�会話��る"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <メッセージ>: <メッセージ> を�在�会話��り込む。�れ� '/' �始�る"
-"メッセージを�信�る時�使�れ��。例: \"/say /join �新���ャットルーム�"
-"�加�る��使���\""
+"メッセージを�信�る時�使�れ��。例: \"/say /join �新��談話室��加�る"
+"��使���\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <相手先ID>: 相手先�����情報を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1458,165 +1423,178 @@ msgstr ""
 "/help [<コマンド>]: サ�ート�れ��るコマンド���を表示。<コマンド> を指定"
 "��ら���使用方法を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "使�方: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "�明�コマンド"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "�明�コマンド���/help �利用�能�コマンドを表示������"
 
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "メッセージを�信�る際�エラー: %s"
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "オフライン"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
-msgstr "無効�仲間��"
+msgstr "無効�相手先��"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "メッセージ�長����"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "未実装��"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "原因�明��"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, fuzzy, c-format
-#| msgid "Error sending message '%s': %s"
-msgid "Error sending message: %s"
-msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "トピック:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "新��トピック: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, fuzzy, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "新��トピック: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "トピック��り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(�案��)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "'%s' を辞書�追加�る"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "'%s' を %s �辞書�追加�る"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "スマイリー�挿入"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "�信(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "スペル��案(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "最近�ログ��得�失敗����"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
-msgstr "%s �切断�れ���"
+msgstr "%s �切断����"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr "%1$s � %2$s �kick�れ���"
+msgstr "%1$s � %2$s � kick �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
-msgstr "%s �kick�れ���"
+msgstr "%s � kick �れ���"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
-msgstr "%1$s � %2$s �BAN�れ���"
+msgstr "%1$s � %2$s � BAN �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
-msgstr "%s �BAN�れ���"
+msgstr "%s � BAN �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
-msgstr "%s �ん�部屋�ら退室����"
+msgstr "%s �ん�談話室�ら退出����"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s �ん�部屋�入室����"
+msgstr "%s �ん�談話室��加����"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s � %s ��り���"
@@ -1624,731 +1602,676 @@ msgstr "%s � %s ��り���"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "�通"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
-msgstr ""
+msgstr "パスワードを�存����?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
-msgstr "メン�ー"
+msgstr "記憶�る"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
-msgstr ""
+msgstr "今����"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�挑戦"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "パスワード�間��������度挑戦������:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
-msgstr "��部屋�パスワード��護�れ����:"
+msgstr "��談話室�パスワード��護�れ����:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
-msgstr "入室�る"
+msgstr "�加�る"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "オンライン"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "会話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
-#, fuzzy, c-format
-#| msgid "%s (%s)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
 msgid "%s (SMS)"
-msgstr "%s (%s)"
+msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
-msgstr ""
+msgstr "相手先をブロック����ん"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
-#, fuzzy
-#| msgid "Linked Contacts"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
-msgstr "リンク中�仲間"
+msgstr "ブロック�る相手先�編集"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
-#| msgid "Linked Contacts"
 msgid "Blocked Contacts"
-msgstr "リンク中�仲間"
+msgstr "ブロック中�相手先"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
-#, fuzzy
-#| msgid "_Remove"
 msgid "Remove"
-msgstr "削除(_R)"
+msgstr "削除"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "リンク先�コピー(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "リンクを開�(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
-msgstr "%Yå¹´%B%eæ—¥ %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "仲間情報�編集"
+msgstr "%Yå¹´%b%eæ—¥ %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "個人�情報"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
-msgstr "新��仲間"
+msgstr "新��相手先"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "%s をブロック����?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "�ん���今後 '%s' �ら�連絡をブロック����?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
-msgstr ""
+msgstr "ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
+msgstr[0] "��相手先を�快・��切���通報�る(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "���決�る(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "登録�リクエスト"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "グループ無所属"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "�気�入り�人�"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "本当� '%s' ���グループを削除����?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "グループ�削除"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "削除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "本当� '%s' ���仲間を削除����?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "仲間�削除"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "仲間�追加(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-#, fuzzy
-#| msgid "_Contact"
-msgid "_Block Contact"
-msgstr "仲間(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "会話(_C)"
+msgstr "相手先�ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音声�会話(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "映��会話(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "会話�履歴(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "ファイル��信"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "デスクトップを共有�る"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "�気�入り"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "情報(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "��部屋�招待���"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "�ャットルーム�招待�る(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "���決�る(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
-msgstr "連絡先��択"
+msgstr "相手先�検索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "検索"
+msgstr "検索:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
-msgstr "仲間�追加(_A)…"
+msgstr "相手先を追加(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
-#, fuzzy
-#| msgid "No match found"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
-msgstr "見��り��ん���"
+msgstr "相手先�見��り��ん���"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
-msgstr ""
+msgstr "自己紹介�メッセージ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "連絡先��択"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "��:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "電話番�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-メールアドレス:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ウェブサイト:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "誕生日:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-#, fuzzy
-#| msgid "_Last Name:"
-msgid "Last seen:"
-msgstr "�字(_L):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-#, fuzzy
-#| msgid "Connected"
-msgid "Connected from:"
-msgstr "オンライン"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
-#| msgid "Quit message:"
-msgid "Away message:"
-msgstr "終了時�メッセージ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:568
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 #, fuzzy
-#| msgid "Ca_ncel"
 msgid "Channels:"
 msgstr "中止(_N)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "ISO�よる国コード:"
+msgstr "ISO �よる国コード:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "連邦・州:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "都市:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地域:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵便番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "通り:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ビル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "階:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "部屋番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "テキスト:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "説明:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "精度�レベル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "エラー:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "上昇速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最後�アップデート�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "経度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "高度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "場所"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:864
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:916
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
-msgstr "%Yå¹´%B%eæ—¥ %R UTC"
+msgstr "%Yå¹´%b%eæ—¥ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:998
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ア�ター��存"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ア�ターを�存����ん"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>場所</b> � (date)\t"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "��:"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "別�:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "電話番�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "クライアント情報"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-メールアドレス"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "クライアント:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "ウェブサイト"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "仲間�詳細"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "誕生日"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#, fuzzy
+msgid "Last seen:"
+msgstr "�字(_L):"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+#, fuzzy
+msgid "Connected from:"
+msgstr "オンライン"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "離席時�メッセージ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#, fuzzy
+msgid "work"
+msgstr "仕事"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#, fuzzy
+msgid "home"
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#, fuzzy
+msgid "mobile"
+msgstr "モ�イル"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#, fuzzy
+msgid "voice"
+msgstr "音声"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#, fuzzy
+msgid "preferred"
+msgstr "設定"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "外観"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "スクリーン�:"
+msgstr "�称:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "別�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>場所</b> � (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "相手先�詳細"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "情報��得中…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "クライアント情報"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "�ージョン:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "クライアント:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"��仲間を登録�るグループを�択������ (1�以上�グループを�択��り�"
-"�る��全��択����も構���ん)"
+"��相手先を登録�るグループを�択������ (2�以上�グループを�択��"
+"り��る��全��択����も構���ん)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "グループ�追加(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "�択"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
+msgstr[0] "以下� ID をブロック���:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "リンク中�仲間"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "リンク�る連絡先��択"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "新��仲間をプレビュー"
+msgstr[0] "以下� ID �ブロック����ん:"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "左�一覧��択��仲間�互��リンク�����"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "相手先情報�編集"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr ""
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "発信"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 #, fuzzy
-#| msgid "File"
 msgid "Mobile"
-msgstr "ファイル"
+msgstr "モ�イル"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 #, fuzzy
-#| msgid "Word"
 msgid "Work"
-msgstr "�語"
+msgstr "仕事"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
-msgstr ""
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "相手先をブロック(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "�ャット(_C)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "会話�履歴(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ファイル��信"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "デスクトップを共有�る"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "�気�入り"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#, fuzzy
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "telepathy-salut �インストール�れ����ん"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "情報(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "��談話室�招待���"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "談話室�招待�る(_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "相手先を追加(_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
-msgstr ""
+msgstr "削除��ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "本当� '%s' ���グループを削除����?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "グループ�削除"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "本当� '%s' ���相手先を削除����?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
-#, fuzzy, c-format
-#| msgid "Meta-contact containing %u contact"
-#| msgid_plural "Meta-contact containing %u contacts"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "相手先�削除"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "%u 人�仲間を�むメタコンタクト"
+msgstr[0] "%u 人�相手先を�むメタ相手先"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "(date) � <b>場所</b>"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新���ットワーク"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC �ットワークを�択"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "�ットワーク�一覧をリセット(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "�択"
@@ -2361,290 +2284,258 @@ msgstr "新��サー�ー"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "仲間�接続"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "リンクを外�(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#, fuzzy
-#| msgid ""
-#| "Completely split the displayed meta-contact into the contacts it contains."
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "メタコンタクトをメタコンタクト��ん��る仲間�完全�分割���。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "リンク(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "Unlink meta-contact '%s'?"
-msgid "Unlink linked contacts '%s'?"
-msgstr "メタコンタクト '%s' �リンクを外����?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to unlink this meta-contact? This will completely "
-#| "split the meta-contact into the contacts it contains."
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"��メタコンタクト�リンクを外������? メタコンタクトを��れ��ん�る"
-"仲間�完全�分割�る����り��。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "リンクを外�(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
-msgstr ""
+msgstr "表示"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "検索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
 msgid "Chat in %s"
-msgstr "%s�発信"
+msgstr "%s ��ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
 msgid "Chat with %s"
-msgstr "%s�発信"
+msgstr "%s ��ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%Yå¹´%B%eæ—¥ %A"
+msgstr "%Yå¹´%b%eæ—¥ %A %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr ""
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
-#, fuzzy, c-format
-#| msgid "<b>Topic:</b>"
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
 msgid "<b>%s:</b> %s"
-msgstr "<b>トピック:</b>"
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
-#, fuzzy, c-format
-#| msgid "%d second ago"
-#| msgid_plural "%d seconds ago"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
-msgstr[0] "%d 秒�"
+msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
-#, fuzzy, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
-msgstr[0] "%d 分�"
+msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
-msgstr ""
+msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
-msgstr "西欧"
+msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
-msgstr "%Yå¹´%B%eæ—¥ %A"
+msgstr "%Yå¹´%b%eæ—¥"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
-msgstr ""
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
-#, fuzzy
-#| msgid "None"
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
-msgstr "��"
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
-msgstr ""
+msgstr "相手先���談話室"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
-msgstr ""
+msgstr "日付"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
-msgstr ""
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
-#, fuzzy
-#| msgid "Set status"
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
-msgstr "状態を設定"
+msgstr "文字�ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
-#, fuzzy
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
-msgstr "発信"
+msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
-#, fuzzy
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
-msgstr "�信��り��"
+msgstr "�信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
-#, fuzzy
-#| msgid "Outgoing voice call"
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
-msgstr "音声�呼����"
+msgstr "発信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
-#, fuzzy
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
-msgstr "%s �ん�ら�呼�出���"
+msgstr "失敗��通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
-#, fuzzy
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
-msgstr "�ャット"
+msgstr "種類"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "会話�履歴����を消去��も�����?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
-#, fuzzy
-#| msgid "C_lear"
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
-msgstr "クリア(_L)"
+msgstr "���消去"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+# 日本語�語順�ら��������「アカウント:���る
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
-msgstr ""
+msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgid "_File"
+msgstr "ファイル(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�ャット"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "編集(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
-msgstr ""
+msgstr "����履歴を消去..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
-msgstr ""
+msgstr "相手先�情報"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "映�"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "�ャット"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "編集(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ビデオ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-#, fuzzy
-#| msgid "File"
-msgid "_File"
-msgstr "ファイル"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "仲間� ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">読�込�中...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "�ャット(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "相手先�オフライン��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "�択��相手先�有効�����明��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "��相手先���種類�会話をサ�ート�����ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "��機能����プロトコル��実装�れ����ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "��相手先�会話を始�る�������ん���"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "���ャン�ル�ら締�出�れ����"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "���ャン�ル�満員��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "���ャン�ル��加�る��招待�れる必���り��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "相手先�サインアウト��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "権���り��ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "会話を開始�る際�エラー�起�り���"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "相手先� ID �電話番�を入力:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新��会話"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "映���信(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "呼�出�(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
-msgstr "新�呼出"
+msgstr "新��通話"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "アカウント <b>%s</b> ��証�失敗����"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"次�アカウント�パスワードを入力������\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2664,22 +2555,18 @@ msgstr "独自�メッセージを編集…"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "�気�入り�状態�ら解除�る��クリック���"
+msgstr "クリック�る����状�メッセージを�気�入り�ら削除���"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "��状態を�気�入り��る��クリック���"
+msgstr "クリック�る����状�メッセージを�気�入り����存���"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
-msgstr "状態を設定"
-
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "在席中���在�状態を設定�る"
+msgstr "在席状�を設定"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "独自�メッセージ…"
 
@@ -2697,24 +2584,20 @@ msgid "Find:"
 msgstr "検索:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Match case"
-msgid "Mat_ch case"
-msgstr "大文字�文字を区別��一致"
+msgid "_Previous"
+msgstr "��(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "フレーズ�見��り��ん���"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "次�(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "大文字�文字を区別�る(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-#, fuzzy
-#| msgid "_Previous Tab"
-msgid "_Previous"
-msgstr "��タブ�(_P)"
+msgid "Phrase not found"
+msgstr "フレーズ�見��り��ん���"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2726,15 +2609,15 @@ msgstr "インスタント・メッセージを�信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "�ャット�加��求���"
+msgstr "�ャット��求���"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
-msgstr "仲間�サインイン��"
+msgstr "相手先�サインイン��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr "仲間�サインアウト��"
+msgstr "相手先�サインアウト��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
@@ -2746,31 +2629,28 @@ msgstr "サー�ー�接続を断��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "音声�呼���られ�"
+msgstr "音声通話��信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "音声�呼����"
+msgstr "音声通話�発信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "音声�会話�終了��"
+msgstr "音声通話�終了��"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "独自�メッセージを編集"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, fuzzy, c-format
-#| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "メッセージを�信��"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
-#, fuzzy
-#| msgid "N_ormal Size"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr "ア�ター���通常サイズ(_O)"
+msgstr "通常サイズ"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2789,73 +2669,49 @@ msgid "Blue"
 msgstr "ブルー"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "�ャットサー�ー�ら�供�れるアイデンティティを検証����ん。\n"
+msgstr "�ャットサー�ー�ら�供�れる ID を検証����ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "証明書��証局�よ��署��れ����ん"
+msgstr "証明書��証局�よ��署��れ����ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
 msgid "The certificate has expired."
-msgstr "証明書�有効期��切れ����"
+msgstr "証明書�有効期��切れ����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "証明書���有効���り��ん"
+msgstr "証明書���有効���り��ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
 msgid "The certificate does not have the expected fingerprint."
-msgstr "証明書�期待��フィンガープリント���り��ん"
+msgstr "証明書�期待��フィンガープリント���り��ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "証明書�検証�れ�ホスト��サー�ー���一致���ん"
+msgstr "証明書�検証�れ�ホスト��サー�ー���一致���ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
 msgid "The certificate is self-signed."
-msgstr "証明書�自己署��れ����"
+msgstr "証明書�自己署��れ����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "証明書�発行者��る�証局�よ���り消�れ����"
+msgstr "証明書�発行者��る�証局�よ��失効�����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
 msgid "The certificate is cryptographically weak."
-msgstr "証明書�暗�的�弱���"
+msgstr "証明書�暗�的�弱���。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
 msgid "The certificate length exceeds verifiable limits."
-msgstr "証明書�検証�能�長�を越�����"
+msgstr "証明書�検証�能�長�を越�����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
 msgid "The certificate is malformed."
-msgstr "証明書�異常��り��"
+msgstr "証明書�異常��り��。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2872,37 +2728,43 @@ msgid "Continue"
 msgstr "続行"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "��接続�信用����ん。無視��続����?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "���択を将��接続�も記憶�る"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "証明書�詳細"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI を開���ん"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ファイル��択"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "ファイルを�存�る��空�容���足�����"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
+"��ファイルを�存�る�� %s �空�容��必�����%s ���り��ん。別�"
+"場所を�ん�����。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s �ん�ら�られ���ファイル"
@@ -3074,41 +2936,32 @@ msgstr "西欧"
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "�択��仲間�ファイルを�信����ん。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "�択��仲間�オフライン��。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "エラーメッセージ��"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
-msgstr "インスタント メッセージ (Empathy)"
+msgstr "インスタントメッセージ (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "起動��ら自動的�サインイン���"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "起動時�仲間リストや他�ダイアログを表示���"
+msgstr "起動時�相手先�一覧や他�ダイアログを表示���"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy インスタントメッセンジャー"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
@@ -3123,7 +2976,7 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Empathy �フリーソフトウェア��;フリーソフトウェア財団��供�る GNU 一般公"
+"Empathy �フリーソフトウェア��; フリーソフトウェア財団�発行�る GNU 一般公"
 "衆利用許諾契約書�第二版��る���れ以��版�定�る�項�下�本プログラム"
 "を�頒布���変更�る�������。"
 
@@ -3134,9 +2987,9 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"Empathy �有用����������頒布������市場性��特定�目的���"
-"��性�����暗黙��証を�������る�証も行����ん。詳細����"
-"� GNU 一般公衆利用許諾契約書を�覧����。"
+"Empathy �役立�も���る��を期待���布�れ������完全�無�証�"
+"�。商用利用���特定�目的���る��性��証��り��ん。詳細� GNU 一般"
+"公衆利用許諾契約書を�覧����。"
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
@@ -3148,11 +3001,11 @@ msgstr ""
 "る����。�����場���Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA ��手紙を書������。"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ���インスタント・メッセンジャー・クライアント��。"
+msgstr "GNOME ��インスタントメッセンジャー・クライアント"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "相花 毅 <takeshi.aihana@gmail.com>\n"
@@ -3161,6 +3014,7 @@ msgstr ""
 "(Contributed to Moblin by Intel GLS)\n"
 "�野 貴之 <AE5T-KSN@asahi-net.or.jp>\n"
 "西堀 清貴 <ml.nishibori.kiyotaka@gmail.com>\n"
+"Mako N <mako@pasero.net>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
 
 #: ../src/empathy-account-assistant.c:167
@@ -3193,79 +3047,81 @@ msgstr ""
 "らアカウントを後�追加�る��も����。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "エラー�発生����"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "��種類�アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "設定���他�アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "アカウント�詳細を入力"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "生����アカウント�種類�?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "他�アカウントを生�����?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "新��アカウント�詳細を入力"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"Empathy�近��人や��や�僚�Google Talk�AIM�Windows Liveや他�プログラム"
-"�会話�����。マイクやウェブカメラ�も音声や映��会話�����。"
+"Empathy を使���近��人や��や�僚� Google トーク�AIM�Windows Live や"
+"他�プログラム��ャット����。マイクやウェブカメラ�も音声やビデオ�通話"
+"����。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "他�会話用プログラム�利用����アカウント��り���?"
+msgstr "他��ャットプログラム�利用����アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "���アカウント�詳細をイン�ート��� "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "���今アカウント�詳細を入力���"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "����新��アカウントを作����"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "����今近��オンライン�人を見������"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "イン�ート���アカウントを�択���:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "��"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "����今��れ��分��"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3277,18 +3133,16 @@ msgstr ""
 "������。'アカウント' �ダイアログ��後�詳細�簡��変更����。�"
 "����機能を無効��る��も����。"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "編集 → アカウント"
 
-#: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
-msgstr "��機能を今�有効�����り��ん"
+msgstr "��機能を今�有効�����り��ん(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3297,88 +3151,96 @@ msgid ""
 msgstr ""
 "ローカル�ットワーク�接続��人々��ャット�る�������ん。telepathy-"
 "salut �インストール�れ��������。��機能を有効��る���"
-"telepathy-salut パッケージをインストール��アカウントダイアログ�ら「��近"
-"���る人���アカウントを作�������。"
+"telepathy-salut パッケージをインストール��アカウントダイアログ�ら People "
+"Nearby �アカウントを作�������。"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut �インストール�れ����ん"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "メッセージング� VoIP �アカウントアシスタント"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
-msgstr "よ���Empathy�"
+msgstr "よ��� Empathy �"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
-msgstr "存在�るアカウントをイン�ート���"
+msgstr "既存�アカウントをイン�ート���"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "個人�詳細�情報を入力������"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr "�存�れ���　%s アカウント��変更��り��。"
+msgstr "%s アカウント���存�れ����変更��り��。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
-msgstr "����新��アカウント����存�れ����ん。"
+msgstr "新��アカウント����存�れ����ん。"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "接続中…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "オフライン — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "切断 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "オフライン - �ットワーク接続��り��ん"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "�明�状態"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "オフライン - アカウント�無効"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"変更を破棄��新��アカウントを生��よ�������。\n"
-"本当�継続����?"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "接続パラメーターを編集"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "サー�ー�ら個人情報を�得�る��失敗����。"
+
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "個人情報を編集�る���オンライン�������。"
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "接続パラメーター�編集(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "コンピューター�ら %s を削除����?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "�れ�よ���サー�ー�らアカウント�削除�れる����り��ん。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3387,19 +3249,15 @@ msgstr ""
 "本当�継続����?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
-msgstr "サインイン(_E)"
+msgstr "有効化(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
-msgstr "サインイン(_E)"
+msgstr "無効化(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3408,24 +3266,18 @@ msgstr ""
 "本当�継続����?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
-#| msgid "_Add…"
 msgid "Add…"
-msgstr "追加(_A)…"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "アカウント�情報を読�込�中"
+msgstr "追加…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "プロトコル�インストール�れ����ん"
+msgid "_Import…"
+msgstr "イン�ート(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3433,160 +3285,144 @@ msgstr ""
 "新��アカウントを登録�る�����最��利用�るプロトコル��ックエンドを"
 "インストール���������。"
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "プロトコル�インストール�れ����ん"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "イン�ート(_I)…"
+msgid "Loading account information"
+msgstr "アカウント�情報を読�込�中"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy �証クライアント"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy �証クライアント"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
-msgstr "��近���る人�"
+msgstr "People nearby"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy 音声/映�クライアント"
+msgstr "- Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
-msgstr "Empathy 音声/映�クライアント"
+msgstr "Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "明る�"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音�"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "サイド�ー(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
-msgstr "音声"
+msgstr "音声入力"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
-msgstr "映�"
+msgstr "ビデオ入力"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "ダイアルパッド"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "詳細"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
-msgstr "%s�発信"
+msgstr "%s ��通話"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "��マシン�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "インター�ット上�サー�ー�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "も�一方����見���ピア�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "リレーサー�ー�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "マル�キャストグループ�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1843
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1846
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1849
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "�明"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "接続���� — %d分%02d秒"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "技術的�詳細"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��音声形�も�"
-"解����ん"
+"%s �ソフトウェア���使��コンピューター�サ�ート�れ��る��音声フォー"
+"マットも�解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��映�形�も�"
-"解����ん"
+"%s �ソフトウェア���使��コンピューター�サ�ート�れ��る��動画フォー"
+"マットも�解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3595,29 +3431,29 @@ msgstr ""
 "%s ��接続を確立����ん���。�ットワーク上���ら��直接接続を許��"
 "れ������も�れ��ん。"
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "�ットワーク��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��音声形������コンピューター�インストール�れ���"
-"�ん"
+"��通話�必��音声フォーマット���使��コンピューター�インストール�れ"
+"����ん"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��映�形������コンピューター�インストール�れ���"
-"�ん"
+"��通話�必��動画フォーマット���使��コンピューター�インストール�れ"
+"����ん"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3628,275 +3464,302 @@ msgstr ""
 "��具�を報告</a>������。��時��ヘルプメニュー�　'デ�ッグ' ウィン"
 "ドウ�集��ログを添付������。"
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
-msgstr "呼�出�エンジン��題�発生����"
+msgstr "通話エンジン��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "ストリーム�終端�到�����"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "音声ストリームを確立����ん"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "映�ストリームを確立����ん"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音声"
+msgid "_Call"
+msgstr "通話(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "デコード用コーデック:"
+msgid "_Microphone"
+msgstr "マイク(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-#, fuzzy
-#| msgid "_Enabled"
-msgid "Disable camera"
-msgstr "サインイン(_E)"
+msgid "_Camera"
+msgstr "カメラ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "設定(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "エンコード�るコーデック:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "表示(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "接続を切る"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "ヘルプ(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "�在�通話を止�る"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "目次(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ローカル�候補:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "デ�ッグ(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "カメラ�入れ替�"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "リモート�候補:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "音声��信"
+msgid "Disable camera"
+msgstr "カメラを無効化�る"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-#| msgid "Send _Video"
-msgid "Send Video"
-msgstr "映���信(_V)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "接続を切る"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
-#| msgid "Dialpad"
-msgid "Show dialpad"
-msgstr "ダイアルパッド"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "�在�通話を止�る"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr ""
+msgid "Video call"
+msgstr "ビデオ通話"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr ""
+msgid "Start a video call"
+msgstr "ビデオ通話�開始"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "音声�転�をオン・オフ"
+msgid "Start an audio call"
+msgstr "音声通話�開始"
 
 #: ../src/empathy-call-window.ui.h:20
-#, fuzzy
-#| msgid "Toggle audio transmission"
-msgid "Toggle video transmission"
-msgstr "音声�転�をオン・オフ"
+msgid "Show dialpad"
+msgstr "ダイアルパッドを表示"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "�明"
+msgid "Display the dialpad"
+msgstr "ダイヤルパッド�表示"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "映���信"
 
 #: ../src/empathy-call-window.ui.h:23
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "Video call"
-msgstr "映��会話(_V)"
+msgid "Toggle video transmission"
+msgstr "ビデオ�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "呼�出�(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "音声��信"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Camera On"
-msgid "_Camera"
-msgstr "カメラ入"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "目次(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "音声�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "デ�ッグ(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "エンコード�るコーデック:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "�明"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "デコード用コーデック:"
 
 #: ../src/empathy-call-window.ui.h:30
-#, fuzzy
-#| msgid "Megaphone"
-msgid "_Microphone"
-msgstr "メガホン"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "リモート�候補:"
 
 #: ../src/empathy-call-window.ui.h:31
-#, fuzzy
-#| msgid "<b>Settings</b>"
-msgid "_Settings"
-msgstr "<b>設定</b>"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "ローカル�候補:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "表示(_V)"
+msgid "Audio"
+msgstr "音声"
+
+#: ../src/empathy-chat-window.c:285
+#, fuzzy
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "メインウィンドウを隠�������。"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:310
+#, fuzzy, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "レベル "
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+#, fuzzy
+#| msgid "Level "
+msgid "Leave room"
+msgstr "レベル "
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (未読 %d)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (他� %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (他�ら %d �未読)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (未読�全部� %d)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
-msgstr ""
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, fuzzy, c-format
-#| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "メッセージを入力�����"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "メッセージを入力�����"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "クリア(_L)"
+msgid "_Conversation"
+msgstr "会話(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "仲間(_O)"
+msgid "C_lear"
+msgstr "消去(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "スマイリー�挿入(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "�気�入り�談話室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "�加者を招待(_P)…"
+msgid "Notify for All Messages"
+msgstr "����メッセージを通知"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "タブを左�移動(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "相手先�一覧�表示(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "タブを��移動(_R)"
+msgid "Invite _Participant…"
+msgstr "�加者を招待(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "����メッセージを通知"
+msgid "C_ontact"
+msgstr "相手先(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "会話(_C)"
+msgid "_Tabs"
+msgstr "タブ(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "タブ��り外�(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "�気�入り��ャットルーム(_F)"
+msgid "_Previous Tab"
+msgstr "��タブ�(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "次�タブ�(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "��タブ�(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "閉��タブを戻�(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "仲間リスト�表示(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "タブを左�移動(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "タブ(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "タブを��移動(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "閉��タブを戻�(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "タブ��り外�(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3904,109 +3767,106 @@ msgstr "��"
 
 #: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
-msgstr "部屋"
+msgstr "談話室"
 
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "自動サインイン"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
-msgstr "�気�入り�部屋"
+msgstr "�気�入り�談話室"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
-msgstr "映��呼���られ�"
+msgstr "ビデオ通話��信"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "�信��り��"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s �ん�ら�映���信����応答����?"
+msgstr "%s �ん�らビデオ通話��信��。応答����?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "%s �ん�ら��信����応答����?"
+msgstr "%s �ん�ら�信��。応答����?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s �ん�ら�呼�出���"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒��る(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "応答�る(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
-msgstr ""
+msgstr "ビデオ�応答(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "%s �ん�ら�映���呼�出���"
+msgstr "%s �ん�ら�ビデオ通話��信��"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
-msgstr "�ャットルーム��招待"
+msgstr "談話室��招待"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ���加�招待"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s �ん����を %s �招待�����"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "�断り�る(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
-msgstr "�加�る(_J)"
+msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �ん����を %s �招待����"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "���� %s ���加�招待を���り���"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s �ん�らファイル転���知ら���"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
-#, fuzzy
-#| msgid "Password"
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
-msgstr "パスワード"
+msgstr "パスワード�必���"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, fuzzy, c-format
-#| msgid "%s would like to send you a file"
 msgid "%s would like permission to see when you are online"
 msgstr "%s �ん�����ファイルを�信���よ���"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -4016,105 +3876,105 @@ msgstr ""
 "メッセージ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s � %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ん�ら�信中"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" �ら %s ��信中"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ら�信エラー"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ファイル�信エラー"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" � %s ���信エラー"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ファイル転�エラー"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" を %s �ん�ら�信����"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" を %s �ん��信���"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ファイル�転��完了����"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "他��加者�応答を待�����"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" �完全性を�ェック�����"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ッシュ計算中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ファイル"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "残り"
 
@@ -4124,194 +3984,209 @@ msgstr "ファイル転�"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Remove completed, canceled and failed file transfers from the list"
+msgstr "終了・�止・失敗��ファイル転�を一覧�ら削除���"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"�り込����アカウント�見��り��ん���。������在�り込�をサ"
-"�ート���る�� Pidgin �アカウント����。"
+"イン�ート�能�アカウント�見��り��ん���。�在�����イン�ートを"
+"サ�ート���る�� Pidgin �アカウント����。"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "アカウント��り込�"
+msgstr "アカウント�イン�ート"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
-msgstr "�り込む"
+msgstr "イン�ート�る"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "�供元"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:389
 #, fuzzy
-#| msgid "Password"
 msgid "Provide Password"
 msgstr "パスワード"
 
-#: ../src/empathy-main-window.c:398
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
-msgstr "�通"
+msgstr "切断"
+
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:660
 msgid "No match found"
 msgstr "見��り��ん���"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:765
+#, fuzzy, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "%s �アカウント��%s �ソフトウェアを更新�る��使���ん。"
+
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "ソフトウェア�更新..."
+
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "閉�る"
+
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "�接続"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "アカウント�編集"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "閉�る"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1138
 #, fuzzy
-#| msgid "Salut account is created"
 msgid "Top up account credit"
 msgstr "Salut �アカウントを生��る����"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
-msgstr "仲間"
-
-#: ../src/empathy-main-window.c:2121
-msgid "Contact List"
-msgstr "仲間リスト"
+msgstr "相手先"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "地図上�仲間(_M)"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "相手先�一覧"
+
+#: ../src/empathy-roster-window.ui.h:1
 #, fuzzy
-#| msgid "Contact List"
-msgid "Find in Contact _List"
-msgstr "仲間リスト"
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "�気�入り�追加(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新��会話(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�気�入り�管�"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新��通話(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "ア�ター���通常サイズ(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "相手先を検索(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新��呼�出�(_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ファイル転�(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "ア�ター�り�通常サイズ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "オフライン�相手先を表示(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "プロトコルを表示(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "クレジット残高"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "地図上�相手先(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "ブロック中�相手先(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "設定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "プロトコル�表示(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "相手先�一覧�検索(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "��順�並�替�(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "状態�並�替�(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "アカウント(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "ア�ター�り�通常サイズ(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-#, fuzzy
-#| msgid "Linked Contacts"
-msgid "_Blocked Contacts"
-msgstr "リンク中�仲間"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "ア�ター���通常サイズ(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "コンパクトサイズ(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ファイル転�(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "談話室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "�加(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新��会話(_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "オフライン�仲間を表示(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人情報(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "部屋(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "�気�入り�追加(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-#, fuzzy
-#| msgctxt "Link individual (contextual menu)"
-#| msgid "_Link Contacts…"
-msgid "_Search for Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�気�入り�管�"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
-msgstr "�ャットルーム"
+msgstr "談話室"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "メン�ー"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4324,347 +4199,349 @@ msgstr ""
 "パスワード�必�: %s\n"
 "メン�ー数: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "���"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
-msgstr "部屋リスト�作�を開始����ん"
+msgstr "談話室�一覧作�を開始����ん"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
-msgstr "部屋リスト�作�を�止����ん"
+msgstr "談話室�一覧作�を�止����ん"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "部屋リストをロード����ん"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "談話室��加�る"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"入室�る部屋���を入力�る��下��る一覧�ら1�以上�部屋をクリック���"
-"���"
+"�加�る談話室���を入力�る��下��る一覧�ら1�以上�談話室をクリック�"
+"�����"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "談話室(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"��部屋を�供���るサー�ーを入力�る�������部屋��在利用���る"
-"サー�ー��る場��空����������"
+"��談話室を�供���るサー�ーを入力�る�������談話室��在利用��"
+"�るサー�ー��る場��空����������"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "部屋��加�る"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "談話室�一覧をロード����ん"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
-msgstr "部屋�一覧"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "部屋(_R):"
+msgstr "談話室�一覧"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新��会話を始��"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "仲間�サインイン��"
+#: ../src/empathy-preferences.c:169
+#, fuzzy
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr "相手先�サインイン��"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "仲間�サインアウト��"
+msgstr "相手先�サインアウト��"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "自分�サインイン��"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "自分�サインアウト��"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "言語"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
-#, fuzzy
-#| msgid "Client:"
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr "クライアント:"
+msgstr "ジュリエット"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
-#, fuzzy
-#| msgid "Room"
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr "部屋"
+msgstr "ロミオ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "���ロミオ�ロミオ ! �������ロミオ�ゃ !"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "���をも嫌��自身��をも棄�や。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "�れ��や�ら�����も����人�ゃ�誓言�や。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "��ゃも�キャピュレットをやも����。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "も�������? ��物を言���?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
-#, fuzzy
-#| msgid "%s has disconnected"
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr "%s �切断�れ���"
+msgstr "ジュリエット�切断����"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "設定"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "スマイリーをアイコン�表示�る(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "談話室�相手先�一覧を表示�る(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外観"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "挙動"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "テーマ(_E):"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "離席中����ら通知を無効��る(_A)"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "離席中����らサウンド�演�を無効��る(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "�信��イベントを通知領域�表示�る"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "起動��ら自動的�接続(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
+msgid "Log conversations"
+msgstr "会話を記録"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "仲間�在席中����ら通知を有効��る"
+msgid "Behavior"
+msgstr "挙動"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "仲間�オフライン����ら通知を有効��る"
+msgid "General"
+msgstr "全般"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "�ャット・ウィンドウ�フォーカス�無��も通知�る(_C)"
+msgid "_Enable bubble notifications"
+msgstr "�ップアップ通知を有効��る(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "スペル�ェックを有効��る:"
+msgid "Disable notifications when _away or busy"
+msgstr "離席中����り込�中���通知を無効��る(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "全般"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "�ャットウィンドウ�フォーカス����も通知�る(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "相手先�在席中����ら通知を有効��る"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr ""
+msgid "Enable notifications when a contact goes offline"
+msgstr "相手先�オフライン����ら通知を有効��る"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "通知"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "場所�ソース:"
+msgid "_Enable sound notifications"
+msgstr "サウンド通知を有効��る(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "会話を記録"
+msgid "Disable sounds when _away or busy"
+msgstr "離席中����り込�中���サウンドを鳴ら���(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "通知"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "イベント�サウンドを鳴ら�"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "サウンド"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "プライ�シー"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "通話�質を�上��る��エコー除去を使�(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"�置精度を下�る����市町�や国�公表�より正確�����り��。GPS座標�"
-"�数点第1���正確��。"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "スマイリーをアイコン�表示�る(_S)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "部屋�仲間リストを表示�る(_L)"
+"エコー除去������声をよりクリア�相手�届���。����コンピューター"
+"�よ����題�生���。奇妙�雑音�����り通話中�音飛���る場���"
+"エコー除去をオフ����通話を����始������。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "サウンド"
+msgid "_Publish location to my contacts"
+msgstr "相手先�場所を公開�る(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "スペル��ェック"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "言語�一覧�インストール���る辞書�言語��を�映���。"
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"�置精度を下�る����国�州(県)�市より精確�場所を公開���ん。GPS 座標"
+"��数点第1����精度��。"
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "テーマ"
+msgid "_Reduce location accuracy"
+msgstr "場所�精度を下�る(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-#, fuzzy
-#| msgid "Bearing:"
-msgid "Variant:"
-msgstr "方�:"
+msgid "Privacy"
+msgstr "プライ�シー"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "起動��ら自動的�接続(_A)"
+msgid "_GPS"
+msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "�帯(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "�ップアップ通知を有効��る(_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "�ットワーク (IP�Wi-Fi)(_N)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "サウンド演��よる通知を有効��る(_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "GPS(_G)"
+msgid "Location sources:"
+msgstr "場所�ソース:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "�ットワーク(IP�Wi-Fi)(_N)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "言語�一覧�インストール���る辞書�言語��を�映���。"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "新��会話�度�別�ウィンドウを開�(_O)"
+msgid "Enable spell checking for languages:"
+msgstr "スペル�ェックを有効��る:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "自分�仲間��置を公表�る(_P)"
+msgid "Spell Checking"
+msgstr "スペル�ェック"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "テーマ(_E):"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "�置精度を下�る(_R)"
+#, fuzzy
+msgid "Variant:"
+msgstr "方�:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "テーマ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状態"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "仲間を�度呼�出�"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "カメラ切"
+msgid "Redial"
+msgstr "リダイアル"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "カメラ入"
+msgid "V_ideo"
+msgstr "ビデオ(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ビデオ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "カメラを無効���映���信を中止"
+msgid "Video Preview"
+msgstr "ビデオ�プレビュー"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "カメラを有効���映�を�る"
+msgid "Video On"
+msgstr "ビデオ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "カメラを有効��る�映�を�ら��"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "相手先を�度呼�出�"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "プレビュー"
+msgid "Camera Off"
+msgstr "カメラ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "リダイアル"
+msgid "Disable camera and stop sending video"
+msgstr "カメラを無効���映���信を中止"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "映�(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "プレビュー"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "映�切"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "カメラを有効��る�映�を�ら��"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "映�入"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "カメラ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "映��プレビュー"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "カメラを有効���映�を�信"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
@@ -4674,7 +4551,7 @@ msgstr "�存"
 
 #: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
-msgstr "デ�ッグ・ウィンドウ"
+msgstr "デ�ッグウィンドウ"
 
 #: ../src/empathy-debug-window.c:1517
 msgid "Pause"
@@ -4730,16 +4607,16 @@ msgid ""
 "extension."
 msgstr "�択��接続マ�ージャー�リモートデ�ッグ拡張をサ�ート�����ん。"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "�加者を招待"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
-msgstr "会話�招待�る仲間を�ん�����"
+msgstr "会話�招待�る相手先を�ん�����"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "招待�る"
 
@@ -4748,11 +4625,9 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ダイアログを何も表示���処�(イン�ート��)を進��終了�る"
 
 #: ../src/empathy-accounts.c:187
-#, fuzzy
-#| msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Salut アカウント���れ��ダイアログを何も表示���"
+msgstr "\"People Nearby\" アカウント���れ��ダイアログを何も表示���"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4764,109 +4639,266 @@ msgstr ""
 msgid "<account-id>"
 msgstr "<アカウント ID>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#, fuzzy
+msgid "Show account assistant"
+msgstr "アカウント・ダイアログを表示�る"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "- Empathy �アカウント"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "Empathy �アカウント"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr ""
 
-#: ../src/empathy-debugger.c:75
-#, fuzzy
-#| msgid "Empathy Debugger"
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
-msgstr "Empathy デ�ッガー"
+msgstr "- Empathy デ�ッガー"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy デ�ッガー"
 
 #: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Chat Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy �ャットクライアント"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "応答�る"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "応答"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
-msgstr ""
+msgstr "ビデオ�応答"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "�断り"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "���る"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 #, fuzzy
-#| msgid "Preview"
 msgid "Provide"
 msgstr "プレビュー"
 
 #: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgstr "%s �呼�出�������������別�通話中���。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
-msgstr ""
+msgstr "ミュート"
 
-#: ../src/empathy-call-window.c:2732
-#, fuzzy
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
-msgstr "場所"
+msgstr "通話時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
-#, fuzzy, c-format
-#| msgid "Connected — %d:%02dm"
+#: ../src/empathy-call-window.c:2937
+#, c-format
 msgid "%s — %d:%02dm"
-msgstr "接続���� — %d分%02d秒"
+msgstr "%s — %d分%02d秒"
+
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "�在�残高� %s ��。"
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "残高��足���る���通話����ん。"
+
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
-#, fuzzy
-#| msgid "Match case"
 msgid "_Match case"
-msgstr "大文字�文字を区別��一致"
+msgstr "大文字�文字を区別�る(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "新��アカウント�追加"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人�情報"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "リンク中�相手先"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "リンク�る連絡先��択"
+
+#~ msgid "New contact preview"
+#~ msgstr "新��相手先をプレビュー"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "左�一覧��択��相手先�互��リンク�����"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "相手先をリンク(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "相手先をリンク"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "リンクを外�(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "表示���るメタ相手先を�個別�相手先�完全�分離���。"
+
+#~ msgid "_Link"
+#~ msgstr "リンク(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "メタ相手先 '%s' �リンクを外����?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "��メタ相手先�リンクを外����? メタ相手先を�個別�相手先�完全�分離"
+#~ "���。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "リンクを外�(_U)"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人情報(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "新���ャット���別�ウィンドウを開�(_O)"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy � butterfly �ログを移行����"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy � butterfly �ログを移行������。"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "サ�ート�れ����ソケットタイプ��"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "Empathy �アカウント"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Empathy �アカウント"
+
+#, fuzzy
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "中止(_N)"
+
+#~ msgid "Ungrouped"
+#~ msgstr "グループ無所属"
+
+#~ msgid "Favorite People"
+#~ msgstr "�気�入り�人�"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "連絡先��択"
+
+#~ msgid "Contact ID:"
+#~ msgstr "仲間� ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "�ャット(_H)"
+
+#~ msgid "Send _Video"
+#~ msgstr "映���信(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "呼�出�(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "在席中���在�状態を設定�る"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "�択��仲間�ファイルを�信����ん。"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "�択��仲間�オフライン��。"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "変更を破棄��新��アカウントを生��よ�������。\n"
+#~ "本当�継続����?"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
 
 #~ msgid "All"
 #~ msgstr "���"
@@ -5016,9 +5048,6 @@ msgstr "大文字�文字を区別��一致"
 #~ msgid "Set your own presence"
 #~ msgstr "����在席情報をセット���"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "アカウント・ダイアログを表示�る"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "エラーメッセージ: <span style=\"italic\">%s</span>"
 
diff --git a/po/ko.po b/po/ko.po
index 92dd59ceb..2e221a3af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,6 +2,7 @@
 # This file is distributed under the same license as the empathy package.
 #
 # Changwoo Ryu <cwryu@debian.org>, 2008, 2009, 2010, 2011.
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012.
 #
 # 새로 번역하시는 분� 아래 "translator-credits"� 추가하세요.
 #
@@ -33,9 +34,9 @@ msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-14 17:48+0000\n"
-"PO-Revision-Date: 2011-10-17 03:03+0900\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"POT-Creation-Date: 2012-03-09 09:48+0000\n"
+"PO-Revision-Date: 2012-03-10 16:50+0900\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,487 +45,539 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "구글 토�, 페�스�, MSN � 기타 대화 서비스�서 대화"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "엠�시"
 
+# IM� 메신저�고 번역
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "메신저 ���언트"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "엠�시 �터넷 메신저"
 
-# IM� 메신저�고 번역
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "메신저 ���언트"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "구글 토�, 페�스�, MSN � 기타 대화 서비스�서 대화"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "메신저 � VoIP 계정"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "메신저 � VoIP 계정 관리"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "새로운 대화는 항� 별�� 대화 표시창� 엽니다."
+msgid "Connection managers should be used"
+msgstr "연결 관리�를 사용합니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "통화 볼륨"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "연결 관리�를 �용해 연결� ��으로 �고 다시 연결할 지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "통화 볼륨, �센트 값."
+msgid "Empathy should auto-connect on startup"
+msgstr "엠�시 시작할 때 �� 연결"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "카메� 장치"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "엠�시가 시작할 때 계정� �� 로그�할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "카메� 위치"
+msgid "Empathy should auto-away when idle"
+msgstr "엠�시�서 입력� 없으면 �리 비움"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "그룹 대화�서 �� 완성� (Tab 키) 사용할 경우 대화명 뒤� 붙� 문�."
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "사용� 입력� 없� 때 엠�시가 �리 비움 모드로 전환할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "대화 표시창 테마"
+msgid "Empathy default download folder"
+msgstr "엠�시 기본 다운로드 ��"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "대화 표시창 테마 변종"
+msgid "The default folder to save file transfers in."
+msgstr "전송 받� 파�� 저장할 기본 ��."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"맞춤법 검사�서 사용할 언어� 목�, 쉼표로 구분 (예를 들어 \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "매� 넘버는 완전 소거 작업� 실행해야 하는지를 �검할 때 사용합니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "간략한 연�처 목�"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c 는 소거 작업� 실행해야 하는지를 검사하기 위해 � "
+"숫�를 사용합니다. 사용�가 � 키를 �접 바꾸지 않는 것� 좋습니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "연결 관리�를 사용합니다"
+msgid "Show offline contacts"
+msgstr "연결 중지 �태 연�처 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "연�처 목� 정렬 기준"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "연�처 목�� 연결 중지 �태� 연�처를 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "�� 통화� 사용할 기본 카메� 장치, 예를 들어 /dev/video0."
+msgid "Show avatars"
+msgstr "아바타 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "아바타 그림� 선�할 기본 디렉터리"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "연�처 목�과 대화 표시창� 연�처� 아바타를 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "�리 비움� 때 �업 알림 사용하지 않기"
+msgid "Show protocols"
+msgstr "프로토콜 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "�리 비움� 때 소리 사용하지 않기"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "연�처 목�� 연�처� 프로토콜� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "�태 �역� 새로 들어온 �벤트 표시"
+msgid "Show Balance in contact list"
+msgstr "연�처 목�� 잔액 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"�태 �역� 새로 들어온 �벤트를 표시합니다. 거짓�면 사용��게 즉시 �벤트"
-"를 알립니다."
+msgid "Whether to show account balances in the contact list."
+msgstr "연�처 목�� 계정 잔액� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "�향 반향 제거 기능"
+msgid "Compact contact list"
+msgstr "간략한 연�처 목�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "사용�� 위치를 공개할 수 있습니다"
+msgid "Whether to show the contact list in compact mode."
+msgstr "연�처 목�� 간략하게 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "GPS를 �용해 위치를 파악할 수 있습니다"
+msgid "Hide main window"
+msgstr "메� 창 �추기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "휴대전화 네트워�를 사용해 위치를 파악할 수 있습니다"
+msgid "Hide the main window."
+msgstr "메� 창� �춥니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "네트워�를 사용해 위치를 파악할 수 있습니다"
+msgid "Default directory to select an avatar image from"
+msgstr "아바타 그림� 선�할 기본 디렉터리"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "엠�시 기본 다운로드 ��"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "최근� 아바타 그림� 선�한 디렉터리."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "엠�시�서 버터플�� 기�� 가져옴"
+msgid "Open new chats in separate windows"
+msgstr "새로운 대화는 별� 창� 열기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "엠�시�서 입력� 없으면 �리 비움"
+msgid "Always open a separate chat window for new chats."
+msgstr "새로운 대화는 항� 별�� 대화 표시창� 엽니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "엠�시 시작할 때 �� 연결"
+msgid "Display incoming events in the status area"
+msgstr "�태 �역� 새로 들어온 �벤트 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "위치를 부정확하게 만듭니다"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"�태 �역� 새로 들어온 �벤트를 표시합니다. 거짓�면 사용��게 즉시 �벤트"
+"를 알립니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "엠�시 대화 표시창� 아�콘으로 연�처� 아바타 사용"
+msgid "The position for the chat window side pane"
+msgstr "대화 가장�리 창� 위치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "웹키트 개발 �구 사용"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "대화 가장�리 창� 저장한 위치 (픽셀 단위)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "새 메시지� �업 알림 사용"
+msgid "Show contact groups"
+msgstr "연�처 그룹 보�기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "맞춤법 검사 사용"
+msgid "Whether to show groups in the contact list."
+msgstr "연�처 목�� 그룹� 보�지� 대한 여부입니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "메� 창 �추기"
+msgid "Contact list sort criterion"
+msgstr "연�처 목� 정렬 기준"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "메� 창� �춥니다."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"연�처 목�� 정렬할 때 사용할 기준입니다. 기본값� \"�태\" 값� 따른 연�처"
+"� �태순으로 정렬합니다. \"name\"��고 하면 �름순으로 정렬합니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "대화명 완성 문�"
+msgid "Use notification sounds"
+msgstr "알리는 소리 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "새로운 대화는 별� 창� 열기"
+msgid "Whether to play a sound to notify of events."
+msgstr "�벤트를 알릴 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "사용할 ��디엄 테마� 경로"
+msgid "Disable sounds when away"
+msgstr "�리 비움� 때 소리 사용하지 않기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "사용할 ��디엄 테마� 경로, 대화� 사용할 테마가 아디움� 경우."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "�리 비움�거나 다른 용무 중� 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "메시지를 받으면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "새 대화 내용� 있으면 소리 내기"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "메시지를 받으면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "메시지를 보내면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "연�처� 누군가가 로그�하면 소리 내기"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "메시지를 보내면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "연�처� 누군가가 로그아웃하면 소리 내기"
+msgid "Play a sound for new conversations"
+msgstr "새 대화 내용� 있으면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "로그�하면 소리 내기"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "새 대화 내용� 있으면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "로그아웃하면 소리 내기"
+msgid "Play a sound when a contact logs in"
+msgstr "연�처� 누군가가 로그�하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "대화� �커스가 없으면 �업 알림"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "연�처� 누군가가 네트워�� 로그�할 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "연�처� 있는 사람� 들어오면 �업 알림"
+msgid "Play a sound when a contact logs out"
+msgstr "연�처� 누군가가 로그아웃하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "연�처� 있는 사람� 나가면 �업 알림"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "연�처� 누군가가 네트워��서 로그아웃할 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "통화 중� 카메� 미리 보기� 위치."
+msgid "Play a sound when we log in"
+msgstr "로그�하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "연�처 목�� 잔액 표시"
+msgid "Whether to play a sound when logging into a network."
+msgstr "네트워�� 로그�할 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "아바타 표시"
+msgid "Play a sound when we log out"
+msgstr "로그아웃하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "방� 연�처 목� 표시"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "네트워��서 로그아웃할 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "메� 창� 닫� 때 안내를 표시합니다."
+msgid "Enable popup notifications for new messages"
+msgstr "새 메시지� �업 알림 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "연결 중지 �태 연�처 표시"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "새 메시지를 받았� 때 �업 알림 창� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "프로토콜 표시"
+msgid "Disable popup notifications when away"
+msgstr "�리 비움� 때 �업 알림 사용하지 않기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "맞춤법 검사 언어"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "�리 비움�거나 다른 용무 중� 때 �업 알림 창� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "전송 받� 파�� 저장할 기본 ��."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "대화� �커스가 없으면 �업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "최근� 아바타 그림� 선�한 디렉터리."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"대화를 열었지만 �커스가 없� 경우�� 새 메시지를 받았� 때 �업 알림 창� "
+"표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "대화 가장�리 창� 위치"
+msgid "Pop up notifications when a contact logs in"
+msgstr "연�처� 있는 사람� 들어오면 �업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "대화 가장�리 창� 저장한 위치 (픽셀 단위)."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "연�처� 사람� 연결하면 �업 알림 창� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마."
+msgid "Pop up notifications when a contact logs out"
+msgstr "연�처� 있는 사람� 나가면 �업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마 변종."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "연�처� 사람� 연결� �어지면 �업 알림 창� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "그래픽 �모티콘 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "알리는 소리 사용"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "대화 내용� 있는 �모티콘� 그림으로 바꿔 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "대화방� 테마 사용"
+msgid "Show contact list in rooms"
+msgstr "방� 연�처 목� 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "사용�� 위치를 연�처� 있는 사람들�게 공개할지 여부."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "대화방� 연�처 목�� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "GPS를 �용해 위치를 파악할지 여부."
+msgid "Chat window theme"
+msgstr "대화 표시창 테마"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "휴대전화 네트워�를 �용해 위치를 파악할지 여부."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "네트워�를 �용해 위치를 파악할지 여부."
+msgid "Chat window theme variant"
+msgstr "대화 표시창 테마 변종"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "엠�시�서 버터플�� 기�� 가져왔는지 여부."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마 변종."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "엠�시가 시작할 때 계정� �� 로그�할지 여부."
+msgid "Path of the Adium theme to use"
+msgstr "사용할 ��디엄 테마� 경로"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "사용� 입력� 없� 때 엠�시가 �리 비움 모드로 전환할지 여부."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "사용할 ��디엄 테마� 경로, 대화� 사용할 테마가 아디움� 경우."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "개� 정보 보호를 위해 위치를 부정확하게 만들지 여부."
+msgid "Enable WebKit Developer Tools"
+msgstr "웹키트 개발 �구 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "엠�시� 대화 표시창 아�콘으로 연�처� 아바타를 사용할지 여부."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "웹키트 개발 툴� (Web Inspector 따위) 사용할지 여부."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "다른 사용��게 내용� 전달하려면 알려주십시오"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "연결 관리�를 �용해 연결� ��으로 �고 다시 연결할 지 여부."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"'작성중' �는 '멈춤' 대화�태를 보낼지� 대한 여부입니다. 현재 '보냄' �태� "
+"대해서는 �향� 주지 않습니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "설정한 언어� 따� 입력하는 중� 단어� 맞춤법� 검사할지 여부."
+msgid "Use theme for chat rooms"
+msgstr "대화방� 테마 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "대화 내용� 있는 �모티콘� 그림으로 바꿔 표시할지 여부."
+msgid "Whether to use the theme for chat rooms."
+msgstr "대화방� 테마를 사용할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "펄스오디오� �향 반향 제거 기능 사용 여부."
+msgid "Spell checking languages"
+msgstr "맞춤법 검사 언어"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "연�처� 누군가가 네트워�� 로그�할 때 알림 소리를 낼지 여부."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"맞춤법 검사�서 사용할 언어� 목�, 쉼표로 구분 (예를 들어 \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "연�처� 누군가가 네트워��서 로그아웃할 때 알림 소리를 낼지 여부."
+msgid "Enable spell checker"
+msgstr "맞춤법 검사 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "�벤트를 알릴 때 소리를 낼지 여부."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "설정한 언어� 따� 입력하는 중� 단어� 맞춤법� 검사할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "메시지를 받으면 소리를 낼지 여부."
+msgid "Nick completed character"
+msgstr "대화명 완성 문�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "새 대화 내용� 있으면 소리를 낼지 여부."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "그룹 대화�서 �� 완성� (Tab 키) 사용할 경우 대화명 뒤� 붙� 문�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "메시지를 보내면 소리를 낼지 여부."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "엠�시 대화 표시창� 아�콘으로 연�처� 아바타 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "네트워�� 로그�할 때 소리를 낼지 여부."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "엠�시� 대화 표시창 아�콘으로 연�처� 아바타를 사용할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "네트워��서 로그아웃할 때 소리를 낼지 여부."
+msgid "Last account selected in Join Room dialog"
+msgstr "방 참여 대화���서 선�한 최근 계정"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "�리 비움�거나 다른 용무 중� 때 알림 소리를 낼지 여부."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "방� 참여하기 위헤 선�한 최근 계정� D-Bus �체 경로입니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "연�처� 사람� 연결� �어지면 �업 알림 창� 표시할지 여부."
+msgid "Camera device"
+msgstr "카메� 장치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "연�처� 사람� 연결하면 �업 알림 창� 표시할지 여부."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "�� 통화� 사용할 기본 카메� 장치, 예를 들어 /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"대화를 열었지만 �커스가 없� 경우�� 새 메시지를 받았� 때 �업 알림 창� "
-"표시할지 여부."
+msgid "Camera position"
+msgstr "카메� 위치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "새 메시지를 받았� 때 �업 알림 창� 표시할지 여부."
+msgid "Position the camera preview should be during a call."
+msgstr "통화 중� 카메� 미리 보기� 위치."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "연�처 목�� 계정 잔액� 표시할지 여부."
+msgid "Echo cancellation support"
+msgstr "�향 반향 제거 기능"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "연�처 목�과 대화 표시창� 연�처� 아바타를 표시할지 여부."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "펄스오디오� �향 반향 제거 기능 사용 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "연�처 목�� 연결 중지 �태� 연�처를 표시할지 여부."
+msgid "Show hint about closing the main window"
+msgstr "메� 창� 닫� 때 안내를 표시합니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "�리 비움�거나 다른 용무 중� 때 �업 알림 창� 표시할지 여부."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"제목 표시줄� 'x' 단추로 메� 창� 닫� 때 알림 대화 창� 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "연�처 목�� 연�처� 프로토콜� 표시할지 여부."
+msgid "Empathy can publish the user's location"
+msgstr "사용�� 위치를 공개할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "대화방� 연�처 목�� 표시할지 여부."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "사용�� 위치를 연�처� 있는 사람들�게 공개할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "연�처 목�� 간략하게 표시할지 여부."
+msgid "Empathy can use the network to guess the location"
+msgstr "네트워�를 사용해 위치를 파악할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"제목 표시줄� 'x' 단추로 메� 창� 닫� 때 알림 대화 창� 표시할지 여부."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "네트워�를 �용해 위치를 파악할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "대화방� 테마를 사용할지 여부."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "휴대전화 네트워�를 사용해 위치를 파악할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "휴대전화 네트워�를 �용해 위치를 파악할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "GPS를 �용해 위치를 파악할 수 있습니다"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "GPS를 �용해 위치를 파악할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "위치를 부정확하게 만듭니다"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"연�처 목�� 정렬할 때 사용할 기준. 기본값� \"name\"으로 연�처� �름� 따"
-"� 정렬합니다. \"state\"�고 하면 �태� 따� 정렬합니다."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "개� 정보 보호를 위해 위치를 부정확하게 만들지 여부."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "메신저 � VoIP 계정 관리"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "�유를 지정하지 않았습니다"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "메신저 � VoIP 계정"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "�태 바꾸기를 요청했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "파� 전송� 취소했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "�대가 파� 전송� 취소했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "파�� 전송하는 중� 오류가 발�했습니다"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "�대가 파�� 전송할 수 없습니다"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "알 수 없는 �유"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "파� 전송 완료�었지만, 파�� ���어 있습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "�격 �대 측�서 파� 전송� 지�하지 않습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "선�한 파�� �반 파�� 아닙니다"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "선�한 파�� 빈 파�입니다"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s�서 온 놓친 호출"
@@ -540,169 +593,138 @@ msgstr "호출함: %s"
 msgid "Call from %s"
 msgstr "호출 받�: %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "� 소켓 종류를 지�하지 않습니다"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "�유를 지정하지 않았습니다"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "�태 바꾸기를 요청했습니다"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "파� 전송� 취소했습니다"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "�대가 파� 전송� 취소했습니다"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "파�� 전송하는 중� 오류가 발�했습니다"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "�대가 파�� 전송할 수 없습니다"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "알 수 없는 �유"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "대화 가능"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "다른 용무 중"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "�리 비움"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�태 �춤"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "연결 중지"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "알 수 없�"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "�유를 지정하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "�태가 연결 중지로 설정�었습니다"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "네트워� 오류"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�� 실패"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "암호화 오류"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "�름� 사용 중입니다"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "��서가 없습니다"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "��서를 신뢰할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "��서가 만료�었습니다"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "��서를 활성화하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "��서 호스트 �름� 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "��서 핑거프린트가 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "�기만 서명한 ��서입니다"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "��서 오류"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "암호화를 사용할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "��서가 올바르지 않습니다"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "연결� 거부�었습니다"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "연결� 완료�지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "연결� �어졌습니다"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "� 리소스는 �미 서버와 연결�어 있습니다"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "� 계정� �미 서버와 연결했습니다"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "기존 연결� 같� 리소스를 사용해 새롭게 연결�었습니다"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "서버� 해당 계정� �미 있습니다"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "서버가 사용량� 너무 많아 연결� 받아들� 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "��서가 철회�었습니다"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "��서가 안전하지 않� 암호화 알고리즘� 사용하거나 암호화가 취약합니다"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -710,277 +732,256 @@ msgstr ""
 "서버 ��서� 길� 혹� 서버 ��서 체�� 단계가 암호화 ��브러리가 지정한 "
 "한계를 넘아갔습니다"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "여러분� 소프트웨어가 너무 오래�었습니다"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "내부 오류"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "주변 사람"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "야후! �본"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "구글 토�"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "페�스� 대화"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%dì´ˆ ì „"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d� 전"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d주 전"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "미래"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "모든 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "암호"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "서버"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�트"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "내 웹 계정"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s 계정� %s�(를) 통해 편집했습니다."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 계정� 엠�시�서 편집할 수 없습니다."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "내 웹 계정 실행"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "%s 편집"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "사용� �름:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "�용(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "로그�(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "서버� � 계정� �미 있습니다"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "서버� 새 계정 만들기"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "취소(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s (서버 %2$s)"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "새 계정"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>예:</b> 내대화명"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "암호(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "고급"
+msgid "Screen _Name:"
+msgstr "대화명(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>예:</b> 내대화명"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "암호(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "암호 저장"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "암호 저장"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "�트(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "암호 저장"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "대화명(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "서버(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM 암호가 무엇입니까?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "고급"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "AIM 아�디가 무엇입니까?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "�트(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM 암호가 무엇입니까?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "서버(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>예:</b> 사용��름"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "암호 저장"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "로그� 아�디(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>예:</b> 사용��름"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "그룹와�즈 사용� 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "그룹와�즈 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ 사용� 번호(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>예:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "문� �코딩(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ 사용� 번호(_U):"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ICQ 사용� 번호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ 암호가 무엇입니까?"
 
@@ -1019,11 +1020,23 @@ msgstr "Options"
 msgid "None"
 msgstr "없�"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "네트워�"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "네트워�:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "문� �코딩:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "서버"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1031,14 +1044,6 @@ msgstr ""
 "대부분 IRC 서버는 암호가 필요 없습니다. 그러므로 잘 모르겠으면 암호를 입력하"
 "지 마십시오."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "네트워�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "네트워�:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "대화명:"
@@ -1055,48 +1060,20 @@ msgstr "나갈 때 메시지:"
 msgid "Real name:"
 msgstr "실제 �름:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "서버"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "IRC 대화명� 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "어� IRC 네트워�입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>예:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>예:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "암호화 필요(_Y) (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL ��서 오류 무시(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "서버 설정 무시"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "우선 순위(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "IRC 대화명� 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "��(_U):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "페�스� 사용� �름� 무엇입니까?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1109,180 +1086,204 @@ msgstr ""
 "사용� �름� 없다면 <a href=\"http://www.facebook.com/username/\">� 페�지"
 "</a>�서 페�스� 사용� �름� 설정하십시오."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "과거 SSL 사용(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "페�스� 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "페�스� 사용� �름� 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "구글 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>예:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "구글 암호가 무엇입니까?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>예:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL ��서 오류 무시(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "우선 순위(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "��(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "암호화 필요(_Y) (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "과거 SSL 사용(_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "서버 설정 무시"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "재버 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "재버 암호가 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "��하는 재버 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "재버 암호가 무엇입니까?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "��하는 재버 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>예:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "윈�우 ��브 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "윈�우 ��브 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "전�메� 주소(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "대화명(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "성(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "�름(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "공개 �름(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "재버 아�디(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "성(_L):"
+msgid "E-_mail address:"
+msgstr "전�메� 주소(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "공개 �름(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "사용� �름(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>예:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "�� 사용� �름:"
-
-# NAT traversal 관련
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "바�딩 검색"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "��으로 STUN 서버 검색"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "� 계정� 사용해 유선 전화나 휴대 전화로 통화(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS 오류 무시"
+msgid "NAT Traversal Options"
+msgstr "NAT 통과 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "간격 (초 단위)"
+msgid "Proxy Options"
+msgstr "프�시 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "연결 유지 옵션"
+msgid "Miscellaneous Options"
+msgstr "기타 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "�슨한 �우팅"
+msgid "STUN Server:"
+msgstr "STUN 서버:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "방�:"
+msgid "Discover the STUN server automatically"
+msgstr "��으로 STUN 서버 검색"
 
+# NAT traversal 관련
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "기타 옵션"
+msgid "Discover Binding"
+msgstr "바�딩 검색"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 통과 옵션"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "서버:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "연결 유지 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "�트:"
+msgid "Mechanism:"
+msgstr "방�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "프�시 옵션"
+msgid "Interval (seconds)"
+msgstr "간격 (초 단위)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "�� 사용� �름:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "전송 방법:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN 서버:"
+msgid "Loose Routing"
+msgstr "�슨한 �우팅"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "서버:"
+msgid "Ignore TLS Errors"
+msgstr "TLS 오류 무시"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "전송 방법:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "� 계정� 사용해 유선 전화나 휴대 전화로 통화(_L)"
+msgid "Port:"
+msgstr "�트:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "SIP 계정 암호가 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "SIP 로그� 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "사용� �름(_U):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "SIP 계정 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "야후! 아�디(_D):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "회� � 대화방 초대 무시(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "방 목� 로캘(_R):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "야후! 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "야후! 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "야후! 아�디(_D):"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "방 목� 로캘(_R):"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1320,61 +1321,65 @@ msgstr "모든 파�"
 msgid "Click to enlarge"
 msgstr "누르면 �게 봅니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "통화를 시작하는� 오류가 발�했습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "지정한 계정� 통화를 지�하지 않습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "지정한 연�처는 연결 중지 �태입니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "지정한 연�처는 올바르지 않습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "� 프로토콜�서는 비� 통화를 지�하지 않습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "연�� 하기 위한 잔고가 부족합니다"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "개� 대화를 시작하는� 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "� 대화�서는 주제 설정� 지�하지 않습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "주제를 바꿀 권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s��(는) 올바른 연�처� 아�디가 아닙니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: 현재 대화� 모든 메시지를 지�니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <주제>: 현재 대화� 주제를 설정합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <대화방아�디>: 새 대화방� 입장합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <대화방아�디>: 새 대화방� 참여합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1382,23 +1387,23 @@ msgstr ""
 "/part [<대화방아�디>] [<�유>]: 대화방� 떠납니다. 기본값� 현재 대화방� 떠"
 "납니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <연�처아�디> [<메시지>]: 개� 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <연�처아�디> [<메시지>]: 개� 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <대화명>: 서버�서 대화명� 바꿉니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <메시지>: 현재 대화�서 ACTION 메시지를 보냅니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1408,11 +1413,11 @@ msgstr ""
 "지를 보낼 때 사용합니다. 예를 들어: \"/say /join 명령으로 대화방� 입장합니다"
 "\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <대화명>: 대화 �대� 대한 정보를 표시합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1420,113 +1425,127 @@ msgstr ""
 "/help [<명령어>]: 명령어 목�� 표시합니다. <명령어>가 있으면 해당 명령어 사"
 "용법� 표시합니다."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "사용법: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "알 수 없는 명령어"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "알 수 없는 명령어. 명령어 목�� /help 명령�서 보십시오"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "메시지를 보내는� 필요한 잔액� 부족합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "메시지를 보내는� 오류, '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "메시지를 보내는� 오류: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"메시지를 보내는� 필요한 잔액� 부족합니다. <a href='%s'>위로 올립니다</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "권한 없�"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "연결 중지"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "연�처가 잘못�었습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "메시지가 너무 �니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "구현하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "알 수 없�"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "메시지를 보내는� 오류, '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "메시지를 보내는� 오류: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "주제:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "주제를 설정했습니다: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s�(가) 주제를 설정했습니다: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "주제를 정하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(제안 없�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "사전� '%s' 추가"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "%2$s 사전� '%1$s' 추가"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "�모티콘 입력"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "보내기(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "맞춤법 제안(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "최근 기�� 가져오는� 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 님� 연결� �겼습니다"
@@ -1534,12 +1553,12 @@ msgstr "%s 님� 연결� �겼습니다"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 님� %2$s 님� �해 퇴장당했습니다."
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%1$s 님� 퇴장당했습니다."
@@ -1547,17 +1566,17 @@ msgstr "%1$s 님� 퇴장당했습니다."
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 님� %2$s 님� �해 입장 금지�습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s 님� 입장 금지�습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 님� 방� 떠났습니다"
@@ -1567,17 +1586,17 @@ msgstr "%s 님� 방� 떠났습니다"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 님� 방� 들어왔습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 님� 대화명� �제부터 %s 입니다"
@@ -1585,90 +1604,90 @@ msgstr "%s 님� 대화명� �제부터 %s 입니다"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "연결 �김"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "� 암호를 저장하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "저장"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "지금 안 함"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "다시 시�"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "암호가 틀렸습니다. 다시 시�해 보십시오:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "� 방� 암호가 설정�어 있습니다:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "입장"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "연결함"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "대화"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (단문 문�)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "아�디를 알 수 없거나 아�디가 올바르지 않습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "연�처 차단� 임시로 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "연�처 차단� 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "연�처를 차단할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "차단 연�처 편집"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "계정:"
 
@@ -1678,462 +1697,367 @@ msgstr "차단한 연�처"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "제거"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "�� 주소 복사(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "�� 열기(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%Y년 %B %d� %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "연�처 정보 편집"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "개� 정보"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "새 연�처"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "'%s' 사용�가 연�하지 못하�� 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "� 연�처를 불량 사용�로 신고(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "나중� 결정(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "가입 요청"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "사용� 차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "그룹 없�"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "�주 연�하는 사람"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "정�로 '%s' 그룹� 지우시겠습니까?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "그룹 지우기"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "제거(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "정�로 '%s' 연�처를 지우시겠습니까?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "연�처를 지�니다"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "연�처 추가(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "연�처 차단(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "대화(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "�성 호출(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "�� 호출(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "예전 대화(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "파� 보내기"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "내 �스�톱 공유"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "�겨 찾기"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "ì •ë³´(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "� 방� 초대"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "대화방� 초대(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "나중� 결정(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "연�처 검색"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "검색: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "연�처 추가(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "연�처가 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "나� 대해 소개하는 메시지:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "연결하면 제게 연�해 주세요. �사합니다!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "연�처 선�"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "전체 �름:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "전화번호:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "전�메� 주소:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "웹사�트:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "��:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "최근 본 때:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "연결 받�, 위치:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "�리 비움 메시지:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "채� 수:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO 국가 코드:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "êµ­ê°€:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "지역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "�시:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "구역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "우편번호:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "길:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "건물:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "층수:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ë°©:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "간�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "설명:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "정확�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "오류:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "수� 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "수� 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "관계:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "�승 ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "최근 업��트 시�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "경�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "위�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "고�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "위치"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y년 %B %e� %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "아바타 저장"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "아바타를 저장할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>위치</b> (날짜별)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "별명:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "���언트 정보"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "���언트:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "개� �세정보"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "연�처 �세히"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "전체 �름"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "전화번호"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "전�메� 주소"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "웹사�트"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "��"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "최근 본 때:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "연결 받� 위치:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "�리 비움 메시지:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "�장"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "집"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "휴대전화"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "�성"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "선호사항"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "우편"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "소�"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "아�디:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "별명:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>위치</b> (날짜별)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "요청한 정보…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "���언트 정보"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "운� 체제:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "버전:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "���언트:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2141,103 +2065,168 @@ msgstr ""
 "� 연�처가 나타날 그룹� 고르십시오. 여러 개� 그룹� 고를 수� 있고 그룹� "
 "고르지 않� 수� 있습니다."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "그룹 추가(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "선�"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "다� 아�디를 차단할 예정입니다:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "다� 아�디를 차단할 수 없습니다:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "연결할 연�처"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "연결할 연�처 선�"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "새 연�처 미리 보기"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "왼쪽� 목��서 선�한 연�처를 서로 연결합니다."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "연�처 정보 편집"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "통화를 할 때 사용할 계정 선�"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "호출"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "휴대전화"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "�장"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "집"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "연�처 차단(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "대화(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "단문 문�(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "�성 호출(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "�� 호출(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "예전 대화(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "파� 보내기"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "내 �스�톱 공유"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "�겨 찾기"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts를 설치하지 않았습니다"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "�세한 연�처를 보려면 gnome-contacts를 설치하여 주십시오."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "ì •ë³´(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "연�처 연결(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "� 방� 초대"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "대화방� 초대(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "연�처 추가(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "삭제 � 차단(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "정�로 '%s' 그룹� 지우시겠습니까?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "그룹 지우기"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "제거(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "정�로 '%s' 연�처를 지우시겠습니까?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2246,7 +2235,11 @@ msgstr ""
 "정�로 연결� '%s' 연�처를 제거하시겠습니까? 그러면 연결� 항목� 들어 있는 "
 "모든 연�처가 지워집니다."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "연�처를 지�니다"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2256,23 +2249,23 @@ msgstr[0] "%u개 연�처가 들어 있는 연결� 연�처"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>위치</b> (날짜별)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "전화 � 휴대전화 장치�서 연결"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "새 네트워�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC 네트워� 선�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "네트워� 목� 초기화(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "선�"
@@ -2285,246 +2278,249 @@ msgstr "새 서버"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "연�처 연결"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "연결 해제(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "연결� 연�처를 완전히 별�� 연�처로 나눕니다."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ì—°ê²°(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "연결� '%s' 연�처� 연결� 해제하시겠습니까?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"정�로 � 연결� 연�처� 연결� 해제하시겠습니까? 그러면 연결� 연�처를 여"
-"러 개� 별개 연�처로 나눕니다."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "연결 해제(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "기�"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "보�기"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "검색"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "대화, 장소: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "대화, �대: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y년 %B %e� %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%sì´ˆ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s분"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "통화 시간 %s, 종료 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "오늘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "어제"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y년 %B %e�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "모든 시간"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "모든 �대"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "�대"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "시간"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "모�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "�스트 채팅"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "받� 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "보낸 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "놓친 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "ë‚´ìš©"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "정�로 �전 대화 기�� 삭제하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "모� 지우기"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "삭제할 곳:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">�어들�는 중...</span>"
+msgid "_File"
+msgstr "파�(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "대화"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "편집(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "모든 기� 삭제..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "프로파�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "��"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "대화"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "편집(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "��"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "파�(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "페�지 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "연�처 아�디:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">�어들�는 중...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "연�처는 연결 중지 �태입니다"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "대화(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "지정한 연�처가 올바르지 않거나 알 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "연�처�서는 � 대화� 종류를 지�하지 않습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "요청한 기능� � 프로토콜�서 지�하지 않습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "주어진 연�처로 대화를 시작할 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "� 채��서 추방�었습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "� 채�� 가� 찼습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "� 채�� 참여하려면 초대받아야 합니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "연결� �는 �안 수행할 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "권한� 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "대화를 시작하는 중 오류가 발�했습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "연�처 �별�나 전화 번호를 입력하십시오:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "새 대화"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "�� 보내기(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "�� 호출(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "호출(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "�성 호출(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "새 호출"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> 계정� 대한 �� 실패"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2561,12 +2557,8 @@ msgstr "� �태를 선호하는 값으로 하려면 누르십시오"
 msgid "Set status"
 msgstr "�태 설정"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "현재 �태를 설정합니다"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "사용� 지정 메시지…"
 
@@ -2574,7 +2566,7 @@ msgstr "사용� 지정 메시지…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "새 %s 계정"
@@ -2584,20 +2576,20 @@ msgid "Find:"
 msgstr "찾기:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "대소문� 구별(_C)"
+msgid "_Previous"
+msgstr "�전(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "찾지 못했습니다"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "다�(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "대소문� 구별(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "�전(_P)"
+msgid "Phrase not found"
+msgstr "찾지 못했습니다"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2644,12 +2636,12 @@ msgid "Edit Custom Messages"
 msgstr "사용� 설정 메시지 편집"
 
 # �태 메시지
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "메시지 편집, %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "보통"
 
@@ -2725,34 +2717,38 @@ msgid "Certificate hostname: %s"
 msgstr "��서 호스트 �름: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "계�"
+msgid "C_ontinue"
+msgstr "계�(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "신뢰할 수 없는 연결"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "연결� 신뢰할 수 없습니다. 그래� 계� 하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "앞으로 연결할 때 �렇게 선�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "��서 �세 정보"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "URI를 열 수 없습니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "파�� 선�하십시오"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "파�� 저장할 빈 공간� 부족합니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2761,7 +2757,7 @@ msgstr ""
 "� 파�� 저장하려면 %s 만�� 빈 공간� 필요하지만, 남� 용량� %s입니다. 다"
 "른 위치를 선�하십시오."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s�서 온 파�"
@@ -2933,40 +2929,32 @@ msgstr "서양 언어"
 msgid "Vietnamese"
 msgstr "베트남어"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "선�한 연�처�서는 파�� 받� 수 없습니다."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "선�한 연�처는 연결 중지 �태입니다."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "오류 메시지 없�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "메신저 (엠�시)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "시작할 때 연결하지 않습니다"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "시작할 때 연�처 목��나 기타 대화창� 표시하지 않습니다"
 
 # IM� 메신저�고 번역
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- 엠�시 메신저 ���언트"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "계정 관리� 연결하는� 오류"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3012,229 +3000,93 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "그놈 �스턴스 메시지 ���언트"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr "GNOME Korea <http://gnome.or.kr/>"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "계정� 가져오는� 오류가 발�했습니다."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "계정 정보를 파싱하는� 오류가 발�했습니다."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "계정� 만드는� 오류가 발�했습니다."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "오류가 발�했습니다."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "오류 메시지는: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"뒤로 �아가서 계정 정보를 다시 입력할 수� 있고, 아니면 � �우미를 마치고 나"
-"중� 편집 메뉴�서 계정� 추가할 수� 있습니다."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "오류가 발�했습니다"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "어떤 종류� 대화 계정� 보유하고 있습니까?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "설정할 � 다른 대화 계정� 있습니까?"
-
-# �구 설명
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "계정 정보를 편집합니다"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "어떤 종류� 대화 계정� 만드시겠습니까?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "다른 대화 계정� � 만드시겠습니까?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "새 계정� 정보를 입력하십시오"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
 msgstr ""
-"엠�시를 사용해 주변� 연결� 사람들 � 구글 토�, AIM, 윈�우 ��브, 기타 "
-"대화 프로그램� 사용하는 친구, �료들과 대화할 수 있습니다. 마��와 웹카메�"
-"를 사용하면 �성 � �� 통화� 할 수 있습니다."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "다른 대화 프로그램�서 사용하� 계정� 있습니까?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "예, 계정 정보를 다��서 가져옵니다: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "예, 지금 계정 정보를 입력합니다"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "아니오, 새 계정� 만듭니다"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "아니오, 현재 주위� 연결한 사람� 보고 싶습니다"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "가져오려는 계정� 선�하십시오:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "예"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "아니오, 지금� �습니다"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"같� 네트워�� 연결� 사람� ��으로 찾아서 대화할 수 있습니다. � 기능� "
-"사용하려면 먼저 아래 사항� 올바른지 확�하십시오. '계정' 대화창�서 � 설정"
-"� 바꿀 수� 있고, � 기능� � 수� 있습니다."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "편집->계정"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "� 기능 사용하지 않기(_N)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"telepathy-salut를 설치하지 않았으므로 로컬 네트워�� 연결� 사람과 대화할 "
-"수 없습니다. � 기능� 사용하려면 telepathy-salut 패키지를 설치하고 '계정' 대"
-"화창�서 '주변 사람\"� 만드십시오"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut를 설치하지 않았습니다"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "메신저 � VoIP 계정 �우미"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "안녕하세요, 엠�시입니다"
-
-# tooltip
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "기존 계정� 가져옵니다"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "개� 정보를 입력하십시오"
+"류창우 <cwryu@debian.org>\n"
+"조성호<darkcircle.0426@gmail.com>"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "%s 계정� 저장하지 않� 수정 사항� 있습니다."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "새로 만든 계정� 아� 저장하지 않았습니다."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "연결하는 중…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "연결 중지 �태 — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "연결 �김 — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "연결 중지 �태 — 네트워� 연결 없�"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "알 수 없는 �태"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"� 계정� 너무 오래�었고 백엔드를 지�하지 않기 때문� 비활성화 �었습니다. "
+"� 계정� 가져오려면 telepathy-haze를 설치하고 세션� 다시 시작하여 주시기 바"
+"�니다."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "연결 중지 �태 — 계정 사용하지 않�"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"새 계정� 만드려 합니다. 그러면 바� 사항� 잃어버리게 �니다. 정� 계� 하시"
-"겠습니까?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "연결 ��를 편집합니다"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "서버로부터 여러붙� 개� 정보를 가져오는� 실패했습니다."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "여러분� 개� 정보를 편집하려면 온��으로 ��하십시오."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "연결 �수 편집(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "정�로 컴퓨터�서 %s 계정� 제거하시겠습니까?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "서버� 계정� 제거하지 않습니다."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3243,15 +3095,23 @@ msgstr ""
 "하시겠습니까?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "사용 않기(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "건너 뛰기(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "ì—°ê²°(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3263,150 +3123,130 @@ msgstr ""
 msgid "Add…"
 msgstr "추가…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "계정 정보를 �어들�는 중입니다"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "프로토콜� 설치하지 않았습니다"
+msgid "_Import…"
+msgstr "가져오기(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "프로토콜:"
+msgid "Loading account information"
+msgstr "계정 정보를 �어들�는 중입니다"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "새 계정� 만들면, 해당 프로토콜� 백엔드를 먼저 설치해야 합니다."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "가져오기(_I)…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "설치한 백엔드 프로토콜� 없습니다"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - 엠�시 �� ���언트"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "엠�시 �� ���언트"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "주변 사람"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- 엠�시 �성/�� ���언트"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "엠�시 �성/�� ���언트"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "대비"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "�기"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "�마"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "볼륨"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "가장�리 창(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "�성 입력"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "�� 입력"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "숫��"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "�세히"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "호출: %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "컴퓨터�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "�터넷 서버�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "다른 �대편 컴퓨터�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "중계 서버가 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "멀티�스트 그룹� IP 주소"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "알 수 없�"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "알 수 없�"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "알 수 없�"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "알 수 없�"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "연결 — %d:%02d"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "기술 정보"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3415,8 +3255,8 @@ msgstr ""
 "� 컴퓨터�서 지�하는 �성 형� 중�서 %s 측� 소프트웨어�서 지�하지 않는 "
 "�성 형�� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3425,8 +3265,8 @@ msgstr ""
 "� 컴퓨터�서 지�하는 �� 형� 중�서 %s 측� 소프트웨어�서 지�하지 않는 "
 "�� 형�� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3435,27 +3275,27 @@ msgstr ""
 "%s� 연결할 수 없습니다. 현재 �접 연결� 허용하지 않는 네트워�� 연결�어 "
 "있� 수� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "네트워� 관련해 실패했습니다."
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "� 호출� 필요한 �성 형�� 지�하는 기능� 컴퓨터� 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "� 호출� 필요한 �� 형�� 지�하는 기능� 컴퓨터� 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3465,257 +3305,300 @@ msgstr ""
 "텔레파시 컴�넌트� 예�치 못한 �� 발�했습니다. <a href=\"%s\">� 버그를 "
 "보고해 주시고</a> �움� 메뉴� '디버깅' 창� 있는 기�� 첨부하십시오."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "호출 엔진� 실패가 발�했습니다"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "스트림� �났습니다"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�성 스트림� 연결할 수 없습니다"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�� 스트림� 연결할 수 없습니다"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�성"
+msgid "_Call"
+msgstr "통화(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "디코딩 코�:"
+msgid "_Microphone"
+msgstr "마��(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "카메� 사용 않기"
+msgid "_Camera"
+msgstr "카메�(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "숫�� 표시"
+msgid "_Settings"
+msgstr "설정(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "�코딩 코�:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "보기(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "�기"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "�움�(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "현재 호출� �습니다"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "차례(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "로컬 후보:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "디버깅(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "최대화"
+msgid "Swap camera"
+msgstr "카메� 바꾸기"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "최소화"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "�격 후보:"
+msgid "Maximise me"
+msgstr "최대화"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "�성 보내기"
+msgid "Disable camera"
+msgstr "카메� 사용 않기"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "�� 보내기"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "�기"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "숫�� 표시"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "현재 호출� �습니다"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "�� 통화"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "�� 통화 시작"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "�성 통화 시작"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "카메� 바꾸기"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "오디오 전송� 켜고 �니다"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "비디오 전송� 켜고 �니다"
+msgid "Show dialpad"
+msgstr "숫�� 표시"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "알 수 없�"
+msgid "Display the dialpad"
+msgstr "숫�� 표시"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "�� 보내기"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "�� 통화"
+msgid "Toggle video transmission"
+msgstr "비디오 전송� 켜고 �니다"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "통화(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "�성 보내기"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "카메�(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "차례(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "오디오 전송� 켜고 �니다"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "디버깅(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "�코딩 코�:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "�움�(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "알 수 없�"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "디코딩 코�:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "마��(_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "�격 후보:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "설정(_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "로컬 후보:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "보기(_V)"
+msgid "Audio"
+msgstr "�성"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "창� 닫으시겠습니까?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "창� 닫으면 %s�서 떠납니다. 다시 참여하지 않는 한 � ��� 메시지를 받� 수 없게 �니다."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"� 창� 닫으면 %u개� 대화방� 닫습니다. 다시 참여하기 전�는 � ��� 메시"
+"지를 받� 수 없습니다."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s�서 나가시겠습니까?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"다시 참여하기 전�는 � 대화방으로부터 � ��� 메시지를 받� 수 없습니다."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "창 닫기"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "방 나가기"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (기타 %u개)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (다른 탭 %d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (모� %d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "단문 문�:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "메시지 %d개 보내는 중"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "메시지를 입력하는 중입니다."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "지우기(_L)"
+msgid "_Conversation"
+msgstr "대화(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "연�처(_O)"
+msgid "C_lear"
+msgstr "지우기(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "�모티콘 입력(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "�겨 찾는 대화방(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "참�� 초대(_P)…"
+msgid "Notify for All Messages"
+msgstr "모든 메시지 알리기"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "탭 왼쪽으로 ��(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "연�처 목� 표시(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "탭 오른쪽으로 ��(_R)"
+msgid "Invite _Participant…"
+msgstr "참�� 초대(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "모든 메시지 알리기"
+msgid "C_ontact"
+msgstr "연�처(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "대화(_C)"
+msgid "_Tabs"
+msgstr "탭(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "탭 떼어내기(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "�겨 찾는 대화방(_F)"
+msgid "_Previous Tab"
+msgstr "�전 탭(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "다� 탭(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "�전 탭(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "탭 닫기 실행 취소(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "연�처 목� 표시(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "탭 왼쪽으로 ��(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "탭(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "탭 오른쪽으로 ��(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "탭 닫기 실행 취소(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "탭 떼어내기(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3729,100 +3612,100 @@ msgstr "ë°©"
 msgid "Auto-Connect"
 msgstr "�� 연결"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "�겨 찾기 대화방 관리"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "�� 호출 받�"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "호출 받�"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 님� �� 호출하고 있습니다. �답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 님� 호출하고 있습니다. �답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s�서 온 호출"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "거부(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "�답(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "��으로 �답(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s�서 온 �� 호출"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "방 초대"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s 방� 초대"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 님� %s 방� 초대합니다"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "ê±°ì ˆ(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "입장(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 님� %s 방� 초대했습니다"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s 방� 초대 받았습니다"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "파� 전송� 받았습니다 (%s�서)"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "암호 필요"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "\"%s\"님� 연결�었� 때 알 수 있는 권한� 요청합니다"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3832,105 +3715,105 @@ msgstr ""
 "메시지: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "알 수 없�"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s (전체 %s, �� %s/s)"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s (ì „ì²´ %s)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" 파� 받는 중 (%s�서)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" 파� 보내는 중 (%s�게)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" 파�� %s�서 받는 중 오류"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "파�� 받는� 오류"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" 파�� %s� 보내는 중 오류"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "파�� 보내는� 오류"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" 파� 받� (%s�서)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" 파� 보냄 (%s�게)"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "파� 전송 완료"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "다른 참��� �답� 기다리는 중입니다"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" 파�� 올바른지 검사하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"� 해시를 구하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "파�"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "남�"
 
@@ -3942,177 +3825,207 @@ msgstr "파� 전송"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "목��서 완료했거나, 취소했거나, 실패한 파� 전송 제거"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "가져오기(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "가져올 계정� 없습니다. 현재 엠�시는 피진 계정 가져오기만 지�합니다."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "계정 가져오기"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "가져오기"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "소스"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "암호 입력"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "연결 �기"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "� 연�처를 보려면 계정� 설정해야 합니다."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "해당 사항� 없습니다"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"죄송하지만, %s 계정� %s 소프트웨어를 업��트 하기 전�는 사용하실 수 없습니"
+"다."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "소프트웨어 업��트..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "닫기"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "다시 연결"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "계정 편집"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "닫기"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "%s 올리기 (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "계정 �레디트 올리기"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "올리기..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "연�처"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "� 연�처를 보려면 여러분� 계정 중 하나를 활성화 해야 합니다."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "� 연�처를 보려면 %s�(를) 활성화 해야 합니다."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "연�처 목�"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "지� 위� 연�처(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "계정 설정"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "�레디트 잔액"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "새 대화(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "연�처 목��서 찾기(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "새 호출(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "�겨 찾기� 입장(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "연�처 검색(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�겨 찾기 관리"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "파� 전송(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "보통 �기(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "연결 중지 �태 연�처(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "새 호출(_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "프로토콜 표시(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "보통 �기, 아바타 �함(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "�레디트 잔액"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "지� 위� 연�처(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "계정(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "차단한 연�처(_B)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "기본 설정(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "프로토콜 표시(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "연�처 목��서 찾기(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "�름 순서로 정렬(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "�태 순서로 정렬(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "계정(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "보통 �기, 아바타 �함(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "차단한 연�처(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "보통 �기(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "작� �기(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "파� 전송(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "ë°©(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "입장(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "새 대화(_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "연결 중지 �태 연�처(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "개� 정보(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "ë°©(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "�겨 찾기� 입장(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "연�처 검색(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�겨 찾기 관리"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "대화방"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "구성�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4125,22 +4038,27 @@ msgstr ""
 "암호 필요: %s\n"
 "구성�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "예"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "아니요"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "방 목�� 시작할 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "방 목�� 중지할 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "방 목�� �어들� 수 없습니다"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "방 입장"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4148,6 +4066,10 @@ msgid ""
 msgstr "입장하려는 방 �름� 입력하거나 목��서 방� 누르십시오."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "대화방(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4155,509 +4077,569 @@ msgstr ""
 "방� 있는 서버를 입력하십시오. 현재 계정� 서버� 그 방� 있는 경우 비워 �십"
 "시오."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "방 입장"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "방 목�� �어들� 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "방 목�"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "대화방(_R):"
-
 # �태 메시지
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "메시지 받�"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "메시지 보냄"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "새 대화"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "연�처가 온��"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "연�처가 연결 중지 �태"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "계정 연결"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "계정 연결 �김"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "언어"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "줄리엣"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "로미오"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "아, 로미오! 로미오! 어째서 당신 �름� 로미오�가요?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "아버지를 잊으시고 그 �름� 버리세요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "그게 싫거든 저를 사랑한다고 맹세만��� 해주세요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "그렇게 못하시겠다면 차�리 제가 � �� �플리트 가문� 성� 쓰지 않겠어요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "좀 � 들어볼까? 아니면 지금 �� 걸어볼까? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "줄리엣 님� 연결� �겼습니다"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "기본 설정"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "�모티콘� 그림으로 표시(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "방� 연�처 목� 표시(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "모양"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "�작"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "다��서 대화를 시작합니다:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "대화 테마(_E):"
+msgid "new ta_bs"
+msgstr "새 탭(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "�리 비움�거나 다른 용무 중� 때 알리지 않기(_A)"
+msgid "new _windows"
+msgstr "새 창(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "�리 비움�거나 다른 용무 중� 때 소리 사용하지 않기(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "알림 �역� 새로 들어온 �벤트 표시"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "시작할 때 ��으로 연결(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"�향 반향 제거 기능� 사용하면 내 목소리가 �대방�게 � 분명히 들립니다. 하"
-"지만 �부 컴퓨터�서 문제가 발�할 수 있습니다. 통화 중� 나 �는 �대방�게 "
-"잡�� 들린 다면 �향 반향 제거 기능� �고 다시 통화해 보십시오."
+msgid "Log conversations"
+msgstr "대화 내용 기�"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "연�처� 사람� 연결하면 알리기"
+msgid "Behavior"
+msgstr "�작"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "연�처� 사람� 연결� �어지면 알리기"
+msgid "General"
+msgstr "�반"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "대화� �커스가 없으면 �업 알리기(_C)"
+msgid "_Enable bubble notifications"
+msgstr "�선 알림 사용(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "맞춤법 검사를 사용할 언어:"
+msgid "Disable notifications when _away or busy"
+msgstr "�리 비움�거나 다른 용무 중� 때 알리지 않기(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "�반"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "대화� �커스가 없으면 �업 알리기(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "입력 단계:"
+msgid "Enable notifications when a contact comes online"
+msgstr "연�처� 사람� 연결하면 알리기"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "입력 볼륨:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "연�처� 사람� 연결� �어지면 알리기"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "알림"
 
-# 위치 정보를 알아내는 방법
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "위치 검색 방법:"
+msgid "_Enable sound notifications"
+msgstr "사운드 알림 사용(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "대화 내용 기�"
+msgid "Disable sounds when _away or busy"
+msgstr "�리 비움�거나 다른 용무 중� 때 소리 사용하지 않기(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "알림"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "�벤트 소리 내기"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "소리"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "개� 정보"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "�향 반향 제거 기능으로 통화 품질 높�기(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"위치 부정확하게 만들기를 사용하면 �시, 지역, 국가 정� �� �세히 표시하지 "
-"않습니다. GPS 좌표는 소수� 1�리까지만 허용합니다."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "�모티콘� 그림으로 표시(_S)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "방� 연�처 목� 표시(_L)"
+"�향 반향 제거 기능� 사용하면 내 목소리가 �대방�게 � 분명히 들립니다. 하"
+"지만 �부 컴퓨터�서 문제가 발�할 수 있습니다. 통화 중� 나 �는 �대방�게 "
+"잡�� 들린 다면 �향 반향 제거 기능� �고 다시 통화해 보십시오."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "소리"
+msgid "_Publish location to my contacts"
+msgstr "위치를 연�처� 있는 사람들�게 공개(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "맞춤법 검사"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "� 언어 목�� 사전� 설치한 언어�만 �용�니다."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"위치 부정확하게 만들기를 사용하면 �시, 지역, 국가 정� �� �세히 표시하지 "
+"않습니다. GPS 좌표는 소수� 1�리까지만 허용합니다."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "테마"
+msgid "_Reduce location accuracy"
+msgstr "위치 부정확하게 만들기(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "�향 반향 제거 기능으로 통화 품질 높�기(_E)"
+msgid "Privacy"
+msgstr "개� 정보"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "변종:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "시작할 때 ��으로 연결(_A)"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "휴대전화(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "�선 알림 사용(_E)"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "네트워�(_N) (IP, Wi-FI)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "사운드 알림 사용(_E)"
+# 위치 정보를 알아내는 방법
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "위치 검색 방법:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "� 언어 목�� 사전� 설치한 언어�만 �용�니다."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "네트워�(_N) (IP, Wi-FI)"
+msgid "Enable spell checking for languages:"
+msgstr "맞춤법 검사를 사용할 언어:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "새로운 대화는 별� 창� 열기(_O)"
+msgid "Spell Checking"
+msgstr "맞춤법 검사"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "위치를 연�처� 있는 사람들�게 공개(_P)"
+msgid "Chat Th_eme:"
+msgstr "대화 테마(_E):"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "변종:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "위치 부정확하게 만들기(_R)"
+msgid "Themes"
+msgstr "테마"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "�태"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "�내기(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "� 연�처� 다시 호출"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "카메� �기"
+msgid "Redial"
+msgstr "다시 걸기"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "카메� 켜기"
+msgid "V_ideo"
+msgstr "��(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "�� �기"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "카메�를 사용하지 않고 �� 보내기를 중지합니다"
+msgid "Video Preview"
+msgstr "�� 미리 보기"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "카메�를 사용하고 ��� 보냅니다"
+msgid "Video On"
+msgstr "�� 켜기"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "카메�를 사용하지만 ��� 보내지 않습니다"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "� 연�처� 다시 호출"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "미리 보기"
+msgid "Camera Off"
+msgstr "카메� �기"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "다시 걸기"
+msgid "Disable camera and stop sending video"
+msgstr "카메�를 사용하지 않고 �� 보내기를 중지합니다"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "��(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "미리 보기"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "�� �기"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "카메�를 사용하지만 ��� 보내지 않습니다"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "�� 켜기"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "카메� 켜기"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "�� 미리 보기"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "카메�를 사용하고 ��� 보냅니다"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "연�처 지� 보기"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "저장"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin ì—°ê²°"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin �답"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"한 번� 붙여넣� ��터가 너무 �니다. 로그를 파�로 저장하여 주십시오."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "디버깅 창"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pastebin으로 보내기"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "�시 중지"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "단계 "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "ì •ë³´"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "메시지"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "경고"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "치명�"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "오류"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "시�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "범위"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "분류"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "단계"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "선�한 연결 관리�는 �격 디버깅 확장 기능� 지�하지 않습니다."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "참�� 초대"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "대화� 초대할 연�처를 고르십시오:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "초대"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "대화창� 표시하지 않고, 필요한 �작� (예를 들어 가져오기) 한 다� �납니다"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "\"주변 사람\" 계정만 있는 경우가 아니�면 대화창� 표시하지 않습니다"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "최초� 주어진 계정� 선�합니다 (예, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<계정아�디>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- 엠�시 계정"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "엠�시 계정"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "특정 서비스 표시"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- 엠�시 디버깅"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "엠�시 디버깅"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- 엠�시 채팅 ���언트"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "�답"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "거부"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "�답"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "��으로 �답"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "ê±°ì ˆ"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "허용"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "ìž…ë ¥"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s�서 호출� 시�했지만, 다른 호출 중�었습니다."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "�시 중지"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "묵�"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "시간"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "현재 잔액� %s 입니다."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "죄송하지만, 전화를 걸 잔고가 부족합니다."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "위로 올리기"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "대소문� 구별(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "어떤 종류� 대화 계정� 보유하고 있습니까?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "새 계정 추가"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "주변 사람"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"엠�시는 같� 네트워�� 연결� 사람� ��으로 찾아서 대화할 수 있습니다. "
+"� 기능� 사용하려면 먼저 아래 사항� 올바른지 확�하십시오."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"� 세부 내용� 나중� 바꾸거나, 연�처 목�� <span style=\"italic\">편집 → "
+"계정</span>� 선�하여 � 기능� 비활성화할 수 있습니다."
diff --git a/po/lv.po b/po/lv.po
index 786e8bacd..c3b273320 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,522 +7,581 @@
 # Anita Reitere <nitalynx@gmail.com>, 2010.
 # Peteris Krisjanis <pecisk@gmail.com>, 2010.
 # Rudolfs <rudolfs.mazurs@gmail.com>, 2011.
-# RÅ«dofls Mazurs <rudolfs.mazurs@gmail.com>, 2011.
+# RÅ«dofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-18 16:18+0000\n"
-"PO-Revision-Date: 2011-09-18 21:14+0300\n"
-"Last-Translator: RÅ«dofls Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-13 10:20+0000\n"
+"PO-Revision-Date: 2012-03-13 17:27+0200\n"
+"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 "X-Generator: Lokalize 1.2\n"
-"Language: lv\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Tērzē, izmantojot Google Talk, Facebook, MSN un daudzus citus tērzēšanas "
-"pakalpojumus"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "TZ klients"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Tūlītēja ziņojumapmaiņa"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "TZ klients"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Tērzē, izmantojot Google Talk, Facebook, MSN un daudzus citus tērzēšanas "
+"pakalpojumus"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Ziņojumapmaiņas un IP balss p�rraides konti"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "P�rvaldīt ziņojumapmaiņas un IP balss p�rraides kontus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Vienmēr atvērt jaunu tērzēšanas logu jaun�m sarakstēm."
+msgid "Connection managers should be used"
+msgstr "Vajadzētu izmantot savienojumu p�rvaldniekus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Zvana skaļums"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Vai vajadzētu izmantot savienojumu p�rvaldnieku, lai autom�tiski atvienotos/"
+"savienotos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Zvana skaļums, izteikts procentos."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy vajadzētu autom�tiski savienoties pēc palaišanas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kameras ierīce"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Vai Empathy pēc palaišanas vajadzētu autom�tiski pieslēgties jūsu kontiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kameras novietojums"
+msgid "Empathy should auto-away when idle"
+msgstr "Kad dators ir dīkst�vē, autom�tiski mainīt statusu uz 'Proj�m'"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
-"tērzēšan�."
+"Vai Empathy vajadzētu mainīt statusu uz 'proj�m', ja lietot�js nedarbojas ar "
+"datoru."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tērzēšanas loga tēma"
+msgid "Empathy default download folder"
+msgstr "Empathy noklusēt� lejupiel�des mape"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Tērzēšanas loga tēmas variants"
+msgid "The default folder to save file transfers in."
+msgstr "Noklusēt� mape, kur� saglab�t saņemtos failus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Valodu saraksts, ko izmantot pareizrakstības p�rbaudei (piemēram: en, fr, "
-"nl)."
+"Maģiskais skaitlis, ko izmanto, lai p�rbaudītu, vai ir j�veic vesel� sapr�ta "
+"apkope"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Kompakts kontaktu saraksts"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c izmanto šo skaitli, lai p�rbaudītu, vai būtu j�veic "
+"uzkopšanas darbi. Lietot�jam nevajadzētu pašam šo skaitli mainīt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Vajadzētu izmantot savienojumu p�rvaldniekus"
+msgid "Show offline contacts"
+msgstr "R�dīt nesaistes kontaktus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kontaktu saraksta k�rtošanas kritērijs"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Vai r�dīt kontaktu sarakst� kontaktus, kuri ir nesaistē."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Noklusēt� kamera, ko izmantot video zvaniem, piem. /dev/video0."
+msgid "Show avatars"
+msgstr "R�dīt attēlus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Noklusēt� mape, no kuras izvēlēties lietot�ja attēlu"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Vai r�dīt kontaktu attēlus kontaktu sarakst� un tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Izslēgt izlecošos paziņojumus, kad esmu proj�m"
+msgid "Show protocols"
+msgstr "R�dīt protokolus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Atslēgt skaņu, kad esmu proj�m"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Vai r�dīt protokolus kontaktu sarakst� un tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "R�dīt ien�košos notikumus statusa lauk�"
+msgid "Show Balance in contact list"
+msgstr "R�dīt bilanci kontaktu sarakst�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"R�dīt ien�košos notikumus statusa lauk�. Ja nepatiess, lietot�jam tos r�dīt "
-"nekavējoties."
+msgid "Whether to show account balances in the contact list."
+msgstr "Vai r�dīt kontu bilanci kontaktu sarakst�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Atbalss atcelšanas atbalsts"
+msgid "Compact contact list"
+msgstr "Kompakts kontaktu saraksts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy drīkst publicēt lietot�ja atrašan�s vietu"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Vai r�dīt kontaktu sarakstu kompaktaj� režīm�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu"
+msgid "Hide main window"
+msgstr "Slēpt galveno logu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu"
+msgid "Hide the main window."
+msgstr "Slēpt galveno logu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu"
+msgid "Default directory to select an avatar image from"
+msgstr "Noklusēt� mape, no kuras izvēlēties lietot�ja attēlu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy noklusēt� lejupiel�des mape"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Pēdēj� mape, no kuras tika ņemts lietot�ja attēls."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy ir p�rnesusi butterfly žurn�lus"
+msgid "Open new chats in separate windows"
+msgstr "Atvērt jaunas sarakstes atsevišķos logos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Kad dators ir dīkst�vē, autom�tiski mainīt statusu uz 'Proj�m'"
+msgid "Always open a separate chat window for new chats."
+msgstr "Vienmēr atvērt jaunu tērzēšanas logu jaun�m sarakstēm."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy vajadzētu autom�tiski savienoties pēc palaišanas"
+msgid "Display incoming events in the status area"
+msgstr "R�dīt ien�košos notikumus statusa lauk�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"R�dīt ien�košos notikumus statusa lauk�. Ja nepatiess, lietot�jam tos r�dīt "
+"nekavējoties."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu"
+msgid "The position for the chat window side pane"
+msgstr "Tērzēšanas loga s�nu rūts novietojums"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Ieslēgt WebKit izstr�des rīkus"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Tērzēšanas loga s�nu paneļa saglab�tais novietojums (pikseļos)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Ieslēgt izlecošos paziņojumus jauniem ziņojumiem"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "R�dīt kontaktu grupas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Ieslēgt pareizrakstības p�rbaudi"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "Vai r�dīt kontaktu grupas kontaktu sarakst�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Slēpt galveno logu"
+msgid "Contact list sort criterion"
+msgstr "Kontaktu saraksta k�rtošanas kritērijs"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Slēpt galveno logu."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Kuru kritēriju izmantot, k�rtojot kontaktu sarakstu. Noklusēt� vērtība ir "
+"\"state\" - k�rtot pēc kontakta statusa. Vērtība \"name\" k�rtos kontaktus "
+"pēc to v�rda."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Iesaukas pabeigšanas rakstzīme"
+msgid "Use notification sounds"
+msgstr "Lietot skaņas paziņojumus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Atvērt jaunas sarakstes atsevišķos logos"
+msgid "Whether to play a sound to notify of events."
+msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Ceļš uz lietojamo Adium tēmu"
+msgid "Disable sounds when away"
+msgstr "Atslēgt skaņu, kad esmu proj�m"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Ceļš uz Adium tēmu, ja t�du izmanto šaj� tērzēšan�."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Atskaņot skaņu ien�košajiem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Atskaņot skaņu jaun�m sarun�m"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par ien�košajiem ziņojumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Atskaņot skaņu izejošajiem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Atskaņot skaņu, kad kontakts ien�k"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Atskaņot skaņu, kad kontakts iziet"
+msgid "Play a sound for new conversations"
+msgstr "Atskaņot skaņu jaun�m sarun�m"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Atskaņot skaņu, kad mēs ieejam"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Vai atskaņot skaņu, lai paziņotu par jaun�m sarun�m."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Atskaņot skaņu, kad mēs izejam"
+msgid "Play a sound when a contact logs in"
+msgstr "Atskaņot skaņu, kad kontakts ien�k"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "R�dīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīkl�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "R�dīt paziņojumu izlecošaj� log�, kad ien�k kontakts"
+msgid "Play a sound when a contact logs out"
+msgstr "Atskaņot skaņu, kad kontakts iziet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "R�dīt paziņojumu izlecošaj� log�, kad iziet kontakts"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izg�jis no tīkla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Novietojums, k�d� j�būt kameras priekšskatījumam zvana laik�."
+msgid "Play a sound when we log in"
+msgstr "Atskaņot skaņu, kad mēs ieejam"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "R�dīt bilanci kontaktu sarakst�"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Vai atskaņot skaņu, piesakoties tīkl�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "R�dīt attēlus"
+msgid "Play a sound when we log out"
+msgstr "Atskaņot skaņu, kad mēs izejam"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "R�dīt kontaktu sarakstu istab�s"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Vai atskaņot skaņu, izejot no tīkla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "R�dīt nor�di par galven� loga aizvēršanu"
+msgid "Enable popup notifications for new messages"
+msgstr "Ieslēgt izlecošos paziņojumus jauniem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "R�dīt nesaistes kontaktus"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Vai r�dīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "R�dīt protokolus"
+msgid "Disable popup notifications when away"
+msgstr "Izslēgt izlecošos paziņojumus, kad esmu proj�m"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Pareizrakstības p�rbaudes valodas"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Vai r�dīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Noklusēt� mape, kur� saglab�t saņemtos failus."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "R�dīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Pēdēj� mape, no kuras tika ņemts lietot�ja attēls."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Vai r�dīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs "
+"jau ir atvērts, bet nav fokusēts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Tērzēšanas loga s�nu rūts novietojums"
+msgid "Pop up notifications when a contact logs in"
+msgstr "R�dīt paziņojumu izlecošaj� log�, kad ien�k kontakts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Tērzēšanas loga s�nu paneļa saglab�tais novietojums (pikseļos)"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts par�d�s tiešsaistē."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
+msgid "Pop up notifications when a contact logs out"
+msgstr "R�dīt paziņojumu izlecošaj� log�, kad iziet kontakts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Tēmas variants, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts iziet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Lietot grafiskos smaidiņus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Lietot skaņas paziņojumus"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Vai sarun�s smaidiņus p�rveidot par grafiskiem attēliem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Lietot tēmu tērzēšanas istab�s"
+msgid "Show contact list in rooms"
+msgstr "R�dīt kontaktu sarakstu istab�s"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Vai Empathy drīkst publicēt lietot�ja atrašan�s vietu viņa kontaktiem."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Vai r�dīt kontaktu sarakstu tērzēšanas istab�s."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu."
+msgid "Chat window theme"
+msgstr "Tērzēšanas loga tēma"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu."
+msgid "Chat window theme variant"
+msgstr "Tērzēšanas loga tēmas variants"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Vai Empathy ir p�rnesusi butterfly žurn�lus."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Tēmas variants, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Vai Empathy pēc palaišanas vajadzētu autom�tiski pieslēgties jūsu kontiem."
+msgid "Path of the Adium theme to use"
+msgstr "Ceļš uz lietojamo Adium tēmu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Vai Empathy vajadzētu mainīt statusu uz 'proj�m', ja lietot�js nedarbojas ar "
-"datoru."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Ceļš uz Adium tēmu, ja t�du izmanto šaj� tērzēšan�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Vai Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti (priv�tumam)."
+msgid "Enable WebKit Developer Tools"
+msgstr "Ieslēgt WebKit izstr�des rīkus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Vai Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Vai WebKit izstr�des rīkiem, piemēram, Web Inspector, vajadzētu būt "
 "ieslēgtiem."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informēt citus lietot�jus par to, kad veicat rakstīšanu"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Vai vajadzētu izmantot savienojumu p�rvaldnieku, lai autom�tiski atvienotos/"
-"savienotos."
+"Vai sūtīt 'raksta' vai 'pauzēts' tērzēšanas st�vokļus. Pašlaik neietekmē "
+"'prom' st�vokli."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Vai p�rbaudīt uzrakstīto v�rdu piederību izvēlētaj�m valod�m."
+msgid "Use theme for chat rooms"
+msgstr "Lietot tēmu tērzēšanas istab�s"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Vai sarun�s smaidiņus p�rveidot par grafiskiem attēliem."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Vai izmantot tēmu tērzēšanas istab�s."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Vai aktivēt Pulseaudio atbalss atcelšanas filtru."
+msgid "Spell checking languages"
+msgstr "Pareizrakstības p�rbaudes valodas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīkl�."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Valodu saraksts, ko izmantot pareizrakstības p�rbaudei (piemēram: en, fr, "
+"nl)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izg�jis no tīkla."
+msgid "Enable spell checker"
+msgstr "Ieslēgt pareizrakstības p�rbaudi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Vai p�rbaudīt uzrakstīto v�rdu piederību izvēlētaj�m valod�m."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par ien�košajiem ziņojumiem."
+msgid "Nick completed character"
+msgstr "Iesaukas pabeigšanas rakstzīme"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Vai atskaņot skaņu, lai paziņotu par jaun�m sarun�m."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
+"tērzēšan�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Vai atskaņot skaņu, piesakoties tīkl�."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Vai Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Vai atskaņot skaņu, izejot no tīkla."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
+"Pēdējais konts, kas tika izvēlēts dialoglodziņ� \"Pievienoties istabai\""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"D-Bus objektu ceļš pēdējam kontam, kas tika izvēlēts, lai savienotos ar "
+"istabu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts iziet."
+msgid "Camera device"
+msgstr "Kameras ierīce"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts par�d�s tiešsaistē."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Noklusēt� kamera, ko izmantot video zvaniem, piem. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Vai r�dīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs "
-"jau ir atvērts, bet nav fokusēts."
+msgid "Camera position"
+msgstr "Kameras novietojums"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Vai r�dīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
+msgid "Position the camera preview should be during a call."
+msgstr "Novietojums, k�d� j�būt kameras priekšskatījumam zvana laik�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Vai r�dīt kontu bilanci kontaktu sarakst�."
+msgid "Echo cancellation support"
+msgstr "Atbalss atcelšanas atbalsts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Vai r�dīt kontaktu attēlus kontaktu sarakst� un tērzēšanas logos."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Vai aktivēt Pulseaudio atbalss atcelšanas filtru."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Vai r�dīt kontaktu sarakst� kontaktus, kuri ir nesaistē."
+msgid "Show hint about closing the main window"
+msgstr "R�dīt nor�di par galven� loga aizvēršanu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Vai r�dīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Vai r�dīt ziņojuma dialogu par galven� loga aizvēršanu ar 'x' pogu "
+"virsraksta josl�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Vai r�dīt protokolus kontaktu sarakst� un tērzēšanas logos."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy drīkst publicēt lietot�ja atrašan�s vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Vai r�dīt kontaktu sarakstu tērzēšanas istab�s."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Vai Empathy drīkst publicēt lietot�ja atrašan�s vietu viņa kontaktiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Vai r�dīt kontaktu sarakstu kompaktaj� režīm�."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Vai r�dīt ziņojuma dialogu par galven� loga aizvēršanu ar 'x' pogu "
-"virsraksta josl�."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Vai izmantot tēmu tērzēšanas istab�s."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Kuru kritēriju izmantot, k�rtojot kontaktu sarakstu. Noklusēt� vērtība ir "
-"\"name\" - k�rtot pēc kontakta v�rda. Vērtība \"state\" k�rtos kontaktus pēc "
-"to statusa."
+"Vai Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti (priv�tumam)."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "P�rvaldīt ziņojumapmaiņas un IP balss p�rraides kontus"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Iemesls netika nor�dīts"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Ziņojumapmaiņas un IP balss p�rraides konti"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "St�vokļa izmaiņas tika pieprasītas"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Jūs atcēl�t faila p�rsūtīšanu"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Otrs dalībnieks atcēla faila p�rsūtīšanu"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Notika kļūda, mēģinot p�rsūtīt failu"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Otrs dalībnieks nevar p�rsūtīt failu"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nezin�ms iemesls"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Faila p�rsūtīšana pabeigta, bet fails ir boj�ts"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Kontakts neatbalsta failu sūtīšanu"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izvēlētais fails nav norm�ls fails"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izvēlētais fails ir tukšs"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Neatbildēts zvans no %s"
@@ -538,172 +597,142 @@ msgstr "Zvanīja %s"
 msgid "Call from %s"
 msgstr "Zvans no %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Ligzdas tips nav atbalstīts"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Iemesls netika nor�dīts"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "St�vokļa izmaiņas tika pieprasītas"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Jūs atcēl�t faila p�rsūtīšanu"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Otrs dalībnieks atcēla faila p�rsūtīšanu"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Notika kļūda, mēģinot p�rsūtīt failu"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Otrs dalībnieks nevar p�rsūtīt failu"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Nezin�ms iemesls"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Pieejams"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Proj�m"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Neredzams"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nesaistē"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Iemesls netika nor�dīts"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Statuss ir \"nesaistē\""
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Tīkla kļūda"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentifik�cija neizdev�s"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Šifrēšanas kļūda"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "V�rds jau ir aizņemts"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nav sertifik�ta"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Neuzticams sertifik�ts"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifik�ts izbeidzies"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifik�ts nav aktivizēts"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Sertifik�tu servera nosaukumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifik�ta digit�lo nospiedumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Sertifik�ts ir pašparakstīts"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Sertifik�ta kļūda"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Šifrēšana nav pieejama"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifik�ts nav derīgs"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Savienojums tika atteikts"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Nevar izveidot savienojumu"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Savienojums p�rtrūka"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Å is resurs jau ir savienots ar serveri"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Å is konts jau ir savienots ar serveri"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Savienojums tika aizvietots ar jaunu savienojumu, kurš izmanto to pašu "
 "resursu"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Uz servera š�ds konts jau ir"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris ir p�r�k aizņemts, lai apstr�d�tu savienojumu"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifik�ts tika atsaukts"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifik�ts izmanto nedrošu šifrēšanas algoritmu vai arī ir kriptogr�fiski "
 "v�jš"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -711,24 +740,31 @@ msgstr ""
 "Servera sertifik�ta garums vai sertifik�ta ķēdes dziļums p�rsniedz "
 "ierobežojumus, ko nosaka kriptogr�fijas bibliotēka"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Jūsu programmatūra ir p�r�k veca"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Iekšēja kļūda"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Tuvum� esošie cilvēki"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook tērzēšana"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -736,7 +772,7 @@ msgstr[0] "Pirms %d sekundes"
 msgstr[1] "Pirms %d sekundēm"
 msgstr[2] "Pirms %d sekundēm"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -744,7 +780,7 @@ msgstr[0] "Pirms %d minūtes"
 msgstr[1] "Pirms %d minūtēm"
 msgstr[2] "Pirms %d minūtēm"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -752,7 +788,7 @@ msgstr[0] "Pirms %d stundas"
 msgstr[1] "Pirms %d stund�m"
 msgstr[2] "Pirms %d stund�m"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -760,7 +796,7 @@ msgstr[0] "Pirms %d dienas"
 msgstr[1] "Pirms %d dien�m"
 msgstr[2] "Pirms %d dien�m"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -768,7 +804,7 @@ msgstr[0] "Pirms %d nedēļas"
 msgstr[1] "Pirms %d nedēļ�m"
 msgstr[2] "Pirms %d nedēļ�m"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -776,224 +812,211 @@ msgstr[0] "Pirms %d mēneša"
 msgstr[1] "Pirms %d mēnešiem"
 msgstr[2] "Pirms %d mēnešiem"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "n�kotnē"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Parole nav atrasta"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s TZ parole (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Parole tērzēšanas istabai '%s' kontam %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Visi konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Parole"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serveris"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ports"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Mani tīmekļa konti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Konts %s tika rediģēts ar %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontu %s nevar rediģēt, izmantojot Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Palaist \"Mani tīmekļa konti\""
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Rediģēt %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Lietot�jv�rds:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Pielietot"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Pieteikties"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Uz servera š�ds konts jau ir"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
-msgstr "Izveidot jaunu kontu uz servera"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "A_tcelt"
+msgstr "Izveidot jaunu kontu uz Å¡Ä« servera"
 
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s uz %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Jauns konts"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Piemērs:</b> MansEkr�naV�rds"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pa_role:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Paplašin�ti"
+msgid "Screen _Name:"
+msgstr "Ekr�_na v�rds:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Piemērs:</b> MansEkr�naV�rds"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pa_role:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Atcerēties paroli"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Atcerēties paroli"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Ports:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Atcerēties paroli"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Ekr�_na v�rds:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Serveris:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "K�da ir jūsu AIM parole?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Paplašin�ti"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "K�ds ir jūsu AIM ekr�na v�rds?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Ports:"
+msgid "What is your AIM password?"
+msgstr "K�da ir jūsu AIM parole?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Serveris:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Piemērs:</b> lietot�jv�rds"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Atcerēties paroli"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Lietot�ja I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Piemērs:</b> lietot�jv�rds"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "K�ds ir jūsu GroupWise lietot�ja ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "K�da ir jūsu GroupWise parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Piemērs:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "R_akstzīmju kopa:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "K�ds ir jūsu ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "K�da ir jūsu ICQ parole?"
 
@@ -1030,11 +1053,23 @@ msgstr "Opcijas"
 msgid "None"
 msgstr "Nekas"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "TÄ«kls"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "TÄ«kls:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Rakstzīmju kopa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serveris"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1042,14 +1077,6 @@ msgstr ""
 "Vairums IRC serveru nepieprasa paroli; ja neesat p�rliecin�ts, neievadiet "
 "paroli."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "TÄ«kls"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "TÄ«kls:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Iesauka:"
@@ -1066,48 +1093,20 @@ msgstr "Iziešanas ziņojums:"
 msgid "Real name:"
 msgstr "Īstais v�rds:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serveris"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "K�ds ir jūsu IRC ekr�na v�rds?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kurš IRC tīkls?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Piemērs:</b> lietotajs@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Piemērs:</b> lietotajs@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Vajad_zīga šifrēšana (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorēt SSL sertifik�ta kļūdas"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Aizst�t servera iestatījumus"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_t�te:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "K�ds ir jūsu IRC ekr�na v�rds?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Res_urss:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "K�ds ir jūsu Facebook lietot�ja v�rds?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1119,179 +1118,203 @@ msgstr ""
 "Ja jums nav Facebook lietot�ja v�rda, varat to izvēlēties <a href=\"http://"
 "www.facebook.com/username/\">šaj� lap�</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Lietot veco SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "K�da ir jūsu Facebook parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "K�ds ir jūsu Facebook lietot�ja v�rds?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "K�ds ir jūsu Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Piemērs:</b> lietotajs@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "K�da ir jūsu Google parole?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Piemērs:</b> lietotajs@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorēt SSL sertifik�ta kļūdas"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_t�te:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Res_urss:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Ši_frēšana pieprasīta (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Lietot veco SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Aizst�t servera iestatījumus"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "K�ds ir jūsu Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "K�da ir jūsu Jabber parole?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "K�ds ir jūsu vēlamais Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "K�da ir jūsu Jabber parole?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "K�da ir jūsu vēlam� Jabber parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Piemērs:</b> lietotajs@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "K�ds ir jūsu Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "K�da ir jūsu Windows Live parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_pasta adrese:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Iesau_ka:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Uzv�rds:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_V�rds:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publiskotais v�rds:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Uzv�rds:"
+msgid "E-_mail address:"
+msgstr "E-_pasta adrese:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publiskotais v�rds:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Lietot�jv�rds:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Piemērs:</b> lietotajs@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Autentifik�cijas v�rds:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Atkl�t saistīšanu"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Atkl�t STUN serveri autom�tiski"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Šo kontu izmantot, _lai zvanītu iekšzemes un mobilajiem t�lruņiem"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorēt TLS kļūdas"
+msgid "NAT Traversal Options"
+msgstr "NAT šķērsošanas opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Interv�ls (sekundēs)"
+msgid "Proxy Options"
+msgstr "Starpniekservera opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-alive opcijas"
+msgid "Miscellaneous Options"
+msgstr "Daž�das opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Brīv� maršrutēšana"
+msgid "STUN Server:"
+msgstr "STUN serveris:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Meh�nisms:"
+msgid "Discover the STUN server automatically"
+msgstr "Atkl�t STUN serveri autom�tiski"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Daž�das opcijas"
+msgid "Discover Binding"
+msgstr "Atkl�t saistīšanu"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT šķērsošanas opcijas"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Serveris:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-alive opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Ports:"
+msgid "Mechanism:"
+msgstr "Meh�nisms:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Starpniekservera opcijas"
+msgid "Interval (seconds)"
+msgstr "Interv�ls (sekundēs)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Autentifik�cijas v�rds:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transports:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN serveris:"
+msgid "Loose Routing"
+msgstr "Brīv� maršrutēšana"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Serveris:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorēt TLS kļūdas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transports:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Šo kontu izmantot, _lai zvanītu iekšzemes un mobilajiem t�lruņiem"
+msgid "Port:"
+msgstr "Ports:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "K�da ir jūsu SIP konta parole?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "K�ds ir jūsu SIP lietot�ja ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Lietot�jv�rds:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "K�da ir jūsu SIP konta parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorēt konferen�u un tērzēšanas istabu uzaicin�jumus"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Istabu saraksta lok�le:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "K�ds ir jūsu Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "K�da ir jūsu Yahoo! parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Istabu saraksta lok�le:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1329,61 +1352,65 @@ msgstr "Visi faili"
 msgid "Click to enlarge"
 msgstr "Klikšķiniet, lai palielin�tu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Gadīj�s kļūda, s�kot zvanu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Nor�dītais kontakts neatbalsta zvanus"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Nor�dītais kontakts ir nesaistē"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Nor�dītais kontakts ir nav derīgs"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Šis protokols neatbalsta �rk�rtas zvanus"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Jums nepietiek kredīt�, lai veiktu šo zvanu"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Neizdev�s izveidot priv�tu tērzēšanas istabu"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Šai sarunai temats nav atbalstīts"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Jums nav tiesību mainīt tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� nav derīgs kontakta ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: attīrīt visus ziņojumus no šīs sarunas"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temats>: uzlikt tematu Å¡ai sarunai"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1391,23 +1418,23 @@ msgstr ""
 "/part [<istabas ID>] [<iemesls>]: pamest tērzēšanas istabu, pēc noklusēšanas "
 "t� ir pašreizēj�"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakta ID> [<ziņojums>]: atvērt priv�to tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakta ID> <ziņojums>: atvērt priv�to tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <iesauka>: mainīt jūsu iesauku uz šī servera"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <darbība>: nosūtīt darbības ziņojumu šaj� sarun�"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1417,11 +1444,11 @@ msgstr ""
 "ziņojumu, kurš s�kas ar '/'. Piemēram: \"/say /join tiek izmantots, lai "
 "pievienotos jaunai tērzēšanas istabai\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: r�dīt inform�ciju par kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1429,113 +1456,127 @@ msgstr ""
 "/help [<komanda>]: r�dīt visas atbalstīt�s komandas. Ja dota <komanda>, "
 "par�dīt t�s lietošanu."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Lietojums: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nezin�ma komanda"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nezin�ma komanda; /help var par�dīt pieejam�s komandas"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nepietiekama bilance, lai nosūtītu ziņojumu"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Kļūda, sūtot ziņojumu '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Kļūda, sūtot ziņojumu: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"nepietiekama bilance, lai nosūtītu ziņojumu. <a href='%s'>Uzpildīt</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "nav spējīgs"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nesaistē"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nederīgs kontakts"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "atļauja liegta"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "p�r�k garš ziņojums"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "nav realizēts"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nezin�ms"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Kļūda, sūtot ziņojumu '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Kļūda, sūtot ziņojumu: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temats:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temats ir: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tematu iestatīja %s un tas ir ir: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Temats nav nor�dīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Nav ieteikumu)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Pievienot '%s' v�rdnīcai"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Pievienot '%s' v�rdnīcai '%s'"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Ievietot smaidiņu"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Sūtīt"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Pareizrakstības ieteikumi"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Neizdev�s iegūt pēdējos ierakstus"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ir izg�jis"
@@ -1543,12 +1584,12 @@ msgstr "%s ir izg�jis"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ņēma un izspēra %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s tika izsperts"
@@ -1556,17 +1597,17 @@ msgstr "%s tika izsperts"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ņēma un izraidīja %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s tika izraidīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s pameta istabu"
@@ -1576,17 +1617,17 @@ msgstr "%s pameta istabu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s pievienoj�s istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s tagad saucas %s"
@@ -1594,90 +1635,90 @@ msgstr "%s tagad saucas %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Atvienots"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Vai vēlaties saglab�t šo paroli?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Atcerēties"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne tagad"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Mēģin�t vēlreiz"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Nepareiza parole; mēģiniet vēlreiz:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Šī istaba ir aizsarg�ta ar paroli:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Pievienoties"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Saruna"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Nezin�ms vai nederīgs identifikators"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktu bloķēšana pagaid�m nepieejama"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Kontaktu bloÄ·Ä“Å¡ana ir nepieejama"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Atļauja liegta"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Neizdev�s bloķēt kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Rediģēt bloķētos kontaktus"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konts:"
 
@@ -1687,62 +1728,53 @@ msgstr "BloÄ·Ä“tie kontakti"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Izņemt"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopēt saites adresi"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Atvērt saiti"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Labot kontakta inform�ciju"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personīg� inform�cija"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Jauns kontakts"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "BloÄ·Ä“t %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Vai tieš�m vēlaties bloķēt '%s' iespēju ar jums sazin�ties?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_BloÄ·Ä“t"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Ziņot par šo kontaktu k� par aizskarošu"
@@ -1750,401 +1782,316 @@ msgstr[1] "_Ziņot par šo kontaktiem k� par aizskarošiem"
 msgstr[2] "_Ziņot par šo kontaktiem k� par aizskarošiem"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Izlemt vē_l�k"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Pierakstīšan�s lūgums"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloķēt lietot�ju"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupēts"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Īpašie cilvēki"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Vai tieš�m vēlaties izņemt grupu '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Izņem grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Izņemt"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Vai tieš�m vēlaties izņemt kontaktu '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Izņem kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Pievienot kontaktu..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_BloÄ·Ä“t kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Tērzēt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Zvans"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video zvans"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Ie_priekšēj�s sarunas"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Sūtīt failu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Dalīties ar manu darbvirsmu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Iecienītais"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_m�cija"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_ediģēt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Aicina jūs uz šo istabu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "Uza_icin�t uz tērzēšanas istabu"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Izlemt vē_l�k"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Meklēt kontaktos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Meklēt:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Pievienot kont_aktu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Kontakti nav atrasti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Ziņojums, ar kuru iepazīstin�t ar sevi:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Lūdzu, ļaujiet man redzēt, kad esat tiešsaistē. Paldies!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izvēlēties kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "V�rds, uzv�rds:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "T�lruņa numurs:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-pasta adrese:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Tīmekļa vietne:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Dzimšanas diena:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Pēdējo reizi redzēts:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Savienojies no:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Ziņa, kad proj�m:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kan�li:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Valsts ISO kods:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Valsts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "St�voklis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Pilsēta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Reģions:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Pasta indekss:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Iela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Ä’ka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "St�vs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Istaba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Precizit�tes līmenis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Kļūda:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertik�l� kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizont�l� kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Ä€trums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Peilējums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "K�pšanas �trums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Pēdējo reizi atjaunin�ts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Garums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Platums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Augstums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Vieta"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Saglab�t attēlu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Nevar saglab�t attēlu"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Vieta</b> (datums)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Pseidonīms:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klienta inform�cija"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klients:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "Personīg� inform�cija"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Kontakta inform�cija"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "V�rds, uzv�rds"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "T�lruņa numurs"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-pasta adrese"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Tīmekļa vietne"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Dzimšanas diena"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Pēdējo reizi redzēts:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Savienojies no:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Ziņa, kad proj�m:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "darbs"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "m�jas"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobilais"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "balss"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "vēlamais"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "pasta"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "sainis"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikators:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Pseidonīms:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Vieta</b> (datums)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Inform�cija pieprasīta..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klienta inform�cija"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versija:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klients:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupas"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2152,107 +2099,180 @@ msgstr ""
 "Izvēlieties grupas, kur�s vēlaties redzēt šo kontaktu. Varat izvēlēties "
 "vienu, vair�kas vai nevienu grupu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Pievienot grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izvēlēties"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sekojošais subjekts tiks bloķēts:"
 msgstr[1] "Sekojošie subjekti tiks bloķēti:"
 msgstr[2] "Sekojošie subjekti tiks bloķēti:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sekojošo subjektu nevar bloķēt:"
 msgstr[1] "Sekojošos subjektus nevar bloķēt:"
 msgstr[2] "Sekojošos subjektus nevar bloķēt:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Labot kontakta inform�ciju"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Saistītie kontakti"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izvēlēties kontaktus, ko saistīt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Jauna kontakta priekšskatījums"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakti, kuri ir izvēlēti kreisaj� sarakst� tiks sasaistīti"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Izvēlieties kontu, ko izmantot zvanu veikšanai"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Zvans"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Mobilais"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Darbs"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "M�jas"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "_BloÄ·Ä“t kontaktu"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1018
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Tērzēt"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Zvans"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video zvans"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "Ie_priekšēj�s sarunas"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Sūtīt failu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Dalīties ar darbvirsmu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Iecienītais"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts nav instalēts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Lūdzu, uzinstalējiet gnome-contacts, lai piekļūtu sīk�kai inform�cijai par "
+"kontaktu."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Infor_m�cija"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Saistīt kontaktus..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Aicina jūs uz šo istabu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "Uza_icin�t uz tērzēšanas istabu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Pievienot kontaktu..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Dzēst un _bloķēt"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Vai tieš�m vēlaties izņemt grupu '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Izņem grupu"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Izņemt"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Vai tieš�m vēlaties izņemt kontaktu '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2261,7 +2281,11 @@ msgstr ""
 "Vai tieš�m vēlaties izņemt saistīto kontaktu '%s'? Ņemiet vēr�, ka tas "
 "izņems visus kontaktus, kuri veido šo saistīto kontaktu."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Izņem kontaktu"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2273,23 +2297,23 @@ msgstr[2] "Saistītais kontakts satur %u kontaktus"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Vieta</b> (datums)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Tiešsaistē no t�lruņa vai mobil�s ierīces"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Jauns tīkls"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Izvēlieties IRC tīklu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Atstatīt _tīkla sarakstu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Izvēlēties"
@@ -2302,254 +2326,253 @@ msgstr "jauns serveris"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Saistītie kontakti"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "A_tsaistīt..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Redzamo saistīto kontaktu pilnīb� sadalīt atsevišķos kontaktos."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Saistīt"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Atsaistīt saistītos kontaktus '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Vai tieš�m vēlaties atsaistīt šos saistītos kontaktus? Tas pilnīb� sadalīs "
-"saistītos kontaktus daž�dos kontaktos."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "A_tsaistīt"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "VÄ“sture"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "R�dīt"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Tērzēšana %s istab�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Tērzēšana ar %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
-#| msgid "%s second"
-#| msgid_plural "%d seconds"
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekunde"
 msgstr[1] "%s sekundes"
 msgstr[2] "%s sekunžu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
-#| msgid "%s minute"
-#| msgid_plural "%d minutes"
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minūte"
 msgstr[1] "%s minūtes"
 msgstr[2] "%s minūšu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Zvans ilga %s, beidz�s %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Å odien"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Vakar"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Jebkad"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Jebkurš"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kad"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Jebkas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Teksta tērzēšana"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Ien�košie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Izejošie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Neatbildētie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Vai tieš�m vēlaties dzēst visu iepriekšējo sarunu žurn�lus?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Attīrīt visu"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Dzēst no:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Iel�dē...</span>"
+msgid "_File"
+msgstr "_Fails"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Tērzēšana"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "R_ediģēt"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Dzēst visu vēsturi..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profils"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Tērzēšana"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_ediģēt"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fails"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "lapa 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakta ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Iel�dē...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Tērzēt"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakts ir nesaistē"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Nor�dītais kontakts ir nav derīgs vai nav zin�ms"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakts neatbalsta š�da veida sarunas"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Šaj� protokol� nav implementēta pieprasīt� funkcionalit�te"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nevarēja uzs�kt sarunu ar doto kontaktu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Jūs esat izraidīts no šī kan�la"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kan�ls ir pilns"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Jums j�saņem uzaicin�jums, lai pievienotos šim kan�lam"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Nevar turpin�t, kamēr ir atvienots"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Atļauja liegta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Gadīj�s kļūda, s�kot sarunu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Ievadiet kontakta identifikatoru vai t�lruņa numuru:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Jauna saruna"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Sūtīt _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video zvans"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "Zv_anīt"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Zv_ans"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
-msgstr "Zvans"
+msgstr "Jauns zvans"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autentifik�cija neizdev�s kontam <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2586,12 +2609,8 @@ msgstr "Klikšķiniet, lai padarītu šo statusu par iecienīto"
 msgid "Set status"
 msgstr "Iestatīt statusu"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Iestatiet savu kl�tbūtni un statusu"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Piel�got�s ziņas..."
 
@@ -2599,7 +2618,7 @@ msgstr "Piel�got�s ziņas..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Jauns %s konts"
@@ -2609,20 +2628,20 @@ msgid "Find:"
 msgstr "Meklēt:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Reģis_trjutīgs"
+msgid "_Previous"
+msgstr "Ie_priekšējais"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Fr�ze nav atrasta"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_N�kamais"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Reģis_trjutīgs"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "Ie_priekšējais"
+msgid "Phrase not found"
+msgstr "Fr�ze nav atrasta"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2668,12 +2687,12 @@ msgstr "Balss zvans beidzies"
 msgid "Edit Custom Messages"
 msgstr "Labot piel�gotos ziņojumus"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Ziņojums rediģēts %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Norm�ls"
 
@@ -2750,34 +2769,39 @@ msgid "Certificate hostname: %s"
 msgstr "Sertifik�ta datora nosaukums: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Turpin�t"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "T_urpin�t"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Neuzticams savienojums"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Šis savienojums nav uzticams. Vai tomēr vēlaties turpin�t?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Atcerēties šo izvēli turpm�kajiem savienojumiem"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Sertifik�ta detaļas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Nevar atvērt URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Nepietiek brīv�s vietas, lai saglab�tu failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2786,7 +2810,7 @@ msgstr ""
 "Ir nepieciešami %s brīvas vietas, lai saglab�tu šo failu, bet ir pieejami "
 "tikai %s. Lūdzu, izvēlieties citu vietu."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ien�košais fails no %s"
@@ -2958,39 +2982,31 @@ msgstr "Rietumu"
 msgid "Vietnamese"
 msgstr "Vjetnamiešu"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Izvēlētais kontakts nevar saņemt failus."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Izvēlētais kontakts ir nesaistē."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nav kļūdas paziņojuma"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Tūlītējs ziņojums (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Nepieslēgties autom�tiski"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Pēc palaišanas ner�dīt kontaktu sarakstu vai k�dus citus dialogus"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy TZ klients"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Kļūda, sazinoties ar konta p�rvaldnieku"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3038,232 +3054,94 @@ msgstr ""
 "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  "
 "02111-1307  USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Tūlītēj�s ziņojumapmaiņas klients GNOME videi"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Raivis Dejus <orvils@gmail.com>\n"
 "RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Anita Reitere <nitalynx@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Gadīj�s kļūda, importējot kontus."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Gadīj�s kļūda, analizējot konta inform�ciju."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Gadīj�s kļūda, veidojot kontu."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Ir notikusi kļūda."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Kļūdas paziņojums: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Jūs varat atgriezties un ievadīt konta inform�ciju vēlreiz, vai arī iziet no "
-"šī palīga un pievienot kontus vēl�k, izmantojot Rediģēšanas izvēlni."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Notika kļūda"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "K�da veida tērzēšanas konts jums ir?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Ievadiet sava konta inform�ciju"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "K�da veida tērzēšanas kontu vēlaties izveidot?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Ievadiet sava jaun� konta inform�ciju"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Ar Empathy jūs varat tērzēt ar tuvum� esošiem cilvēkiem, k� arī ar draugiem "
-"un kolēģiem, kuri izmanto Google Talk, AIM, Windows Live un daudzas citas "
-"tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs varat veikt arī "
-"audio un video zvanus."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "J�, es vēlos importēt manu konta inform�ciju no "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "J�, es tagad ievadīšu sava konta inform�ciju"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nē, es vēlos veidot jaunu kontu"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nē, es pagaid�m vēlos tikai redzēt tuvum� atrodamos cilvēkus"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Izvēlieties kontus, kurus vēlaties importēt:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "J�"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nē, pagaid�m tas ir viss"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy var autom�tiski atrast tērzēšanai cilvēkus jūsu lok�laj� tīkl�. Ja "
-"vēlaties lietot šo iespēju, lūdzu, p�rliecinieties, ka nor�dīt�s detaļas ir "
-"pareizas. Vēl�k jūs t�s varat viegli izmainīt vai atslēgt šo iespēju, "
-"izmantojot dialogu 'Konti'."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Rediģēt->Konti"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Es pagaid�m _nevēlos ieslēgt šo iespēju"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Neizdosies tērzēt ar cilvēkiem lok�laj� tīkl�, jo telepathy-salut nav "
-"instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet telepathy-"
-"salut pakotni un izveidojiet atbilstošo kontu Kontu dialog�"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut nav instalēts"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Ziņojumapmaiņas un IP balss p�rraides kontu asistents"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Laipni lūdzam Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importēt jau esošos kontus"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "LÅ«dzu, ievadiet savus datus"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Kontam %s ir nesaglab�tas izmaiņas."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Jaunais konts vēl nav saglab�ts."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Savienojas..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nesaistē — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Atvienots — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nesaistē — nav tīkla savienojuma"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nezin�ms statuss"
 
-#: ../src/empathy-accounts-dialog.c:428
-msgid "Offline — Account Disabled"
-msgstr "Nesaistē — konts atslēgts"
-
-#: ../src/empathy-accounts-dialog.c:831
+#: ../src/empathy-accounts-dialog.c:458
 msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
 msgstr ""
-"Jūs tūlīt izveidosiet jaunu kontu, kas izmetīs jūsu izmaiņas.\n"
-"Vai tieš�m vēlaties turpin�t?"
+"Šis konts tika deaktivēts, ko tas balst�s uz vecu un neatbalstītu aizmuguri. "
+"Lūdzu, uzinstalējiet telepathy-haze un p�rstartējiet sesiju, lai migrētu šo "
+"kontu."
+
+#: ../src/empathy-accounts-dialog.c:468
+msgid "Offline — Account Disabled"
+msgstr "Nesaistē — konts deaktivēts"
+
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Rediģēt savienojuma parametrus"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Neizdev�s saņemt jūsu personīgo inform�ciju no servera."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Dodieties tiešsaistē, lai rediģētu savu personīgo inform�ciju."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "R_ediģēt savienojuma parametrus..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vai vēlaties izņemt %s no sava datora?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Tas neizņems jūsu kontu no servera."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3272,15 +3150,24 @@ msgstr ""
 "Vai tieš�m vēlaties turpin�t?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "I_eslēgt"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Atslēgt"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "Izlai_st"
+
+#: ../src/empathy-accounts-dialog.c:2130
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "_Savienoties"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3292,19 +3179,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Pievienot..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Iel�dē konta inform�ciju"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Protokols nav uzinstalēts"
+msgid "_Import…"
+msgstr "_Importēt..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokols:"
+msgid "Loading account information"
+msgstr "Iel�dē konta inform�ciju"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3312,132 +3195,117 @@ msgstr ""
 "Lai izveidotu jaunu kontu, vispirms j�instalē aizmugure katram protokolam, "
 "kuru vēlaties izmantot."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importēt..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "Protokola aizmugure nav uzinstalēta"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentifik�cijas klients"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy autentifik�cijas klients"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Tuvum� esošie cilvēki"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video klients"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy audio/video klients"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrasts"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Spilgtums"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Skaļums"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_S�njosla"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio ievade"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video ievade"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Ciparnīca"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Sīk�ka inform�cija"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Zvans ar %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP adrese, kuru redz dators"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adrese, kuru redz serveris Internet�"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adrese, kuru redz biedrs otr� gal�"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Translēšanas servera IP adrese"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Multiraides grupas IP adreses"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nezin�ms"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nezin�ms"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nezin�ms"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Savienojies — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehnisk� inform�cija"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3446,8 +3314,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "audio form�tiem"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3456,8 +3324,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "video form�tiem"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3466,25 +3334,25 @@ msgstr ""
 "Nevar izveidot savienojumu ar %s. Iespējams, ka viens no jums atrodas tīkl�, "
 "kur� nav atļauti tiešie savienojumi."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Gadīj�s tīkla kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie audio form�ti nav instalēti jūsu dator�"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie video form�ti nav instalēti jūsu dator�"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3495,161 +3363,213 @@ msgstr ""
 "\">ziņojiet par šo kļūdu</a>, pievienojot ierakstus no 'Atkļūdot' loga "
 "Palīdzības izvēlnē."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Zvanu dzinī gadīj�s kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Tika sasniegtas plūsmas beigas"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nevar izveidot audio plūsmu"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nevar izveidot video plūsmu"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Zvanīt"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Atkodēšanas kodeks:"
+msgid "_Microphone"
+msgstr "_Mikrofons"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Atslēgt kameru"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "R�dīt ciparnīcu"
+msgid "_Settings"
+msgstr "Ie_statījumi"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Iekodēšanas kodeks:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Skats"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Nolikt klausuli"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Palīdzība"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Beigt Å¡o zvanu"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Saturs"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lok�lais kandid�ts:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Atkļūdot"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maksimizēt mani"
+msgid "Swap camera"
+msgstr "Mainīt kameru"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizēt mani"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Att�lin�tais kandid�ts:"
+msgid "Maximise me"
+msgstr "Maksimizēt mani"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Sūtīt audio"
+msgid "Disable camera"
+msgstr "Atslēgt kameru"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Sūtīt video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Nolikt klausuli"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "R�dīt ciparnīcu"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Beigt Å¡o zvanu"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video zvans"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "S�kt video zvanu"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "S�kt audio zvanu"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Mainīt kameru"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "P�rslēgt audio p�rraidi"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "P�rslēgt video p�rraidi"
+msgid "Show dialpad"
+msgstr "R�dīt ciparnīcu"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "Nezin�ms"
+msgid "Display the dialpad"
+msgstr "R�dīt ciparnīcu"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Sūtīt video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video zvans"
+msgid "Toggle video transmission"
+msgstr "P�rslēgt video p�rraidi"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Zvanīt"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Sūtīt audio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Saturs"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "P�rslēgt audio p�rraidi"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Atkļūdot"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Iekodēšanas kodeks:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Palīdzība"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nezin�ms"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Atkodēšanas kodeks:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofons"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Att�lin�tais kandid�ts:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Ie_statījumi"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lok�lais kandid�ts:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Skats"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Aizvērt šo logu?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Šī loga aizvēršana pametīs %s. Jūs nesaņemsiet jaunus ziņojumus, kamēr atkal "
+"nepievienosities."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabu. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+msgstr[1] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabas. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+msgstr[2] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabas. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Pamest %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Jūs nesaņemsiet jaunus ziņojumus no šīs tērzēšanas istabas, kamēr atkal "
+"nepievienosities."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Aizvērt logu"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Pamest istabu"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3657,7 +3577,7 @@ msgstr[0] "%s (%d nelasīts)"
 msgstr[1] "%s (%d nelasīti)"
 msgstr[2] "%s (%d nelasīti)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3665,7 +3585,7 @@ msgstr[0] "%s (un %u cits)"
 msgstr[1] "%s (un %u citi)"
 msgstr[2] "%s (un %u citi)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3673,7 +3593,7 @@ msgstr[0] "%s (%d nelasīts no citiem)"
 msgstr[1] "%s (%d nelasīti no citiem)"
 msgstr[2] "%s (%d nelasīti no citiem)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3681,11 +3601,11 @@ msgstr[0] "%s (%d nelasīts no visiem)"
 msgstr[1] "%s (%d nelasīti no visiem)"
 msgstr[2] "%s (%d nelasīti no visiem)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3693,69 +3613,69 @@ msgstr[0] "Sūta %d ziņojumu"
 msgstr[1] "Sūta %d ziņojumus"
 msgstr[2] "Sūta %d ziņojumu"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Raksta ziņojumu."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "At_tīrīt"
+msgid "_Conversation"
+msgstr "_Saruna"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakts"
+msgid "C_lear"
+msgstr "At_tīrīt"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ievietot _smaidiņu"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Iecienīt� tērzēšanas istaba"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Ielūgt _dalībnieku..."
+msgid "Notify for All Messages"
+msgstr "Ziņot par visiem ziņojumiem"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "P�rvietot ci_lni pa kreisi"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "R�dīt kontaktu _sarakstu"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "P�_rvietot cilni pa labi"
+msgid "Invite _Participant…"
+msgstr "Ielūgt _dalībnieku..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Ziņot par visiem ziņojumiem"
+msgid "C_ontact"
+msgstr "K_ontakts"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Saruna"
+msgid "_Tabs"
+msgstr "_Cilnes"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "At_dalīt cilni"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Iecienīt� tērzēšanas istaba"
+msgid "_Previous Tab"
+msgstr "_Iepriekšēj� cilne"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_N�kam� cilne"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Iepriekšēj� cilne"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Atsa_ukt cilnes aizvēršanu"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "R�dīt kontaktu _sarakstu"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "P�rvietot ci_lni pa kreisi"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Cilnes"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "P�_rvietot cilni pa labi"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Atsa_ukt cilnes aizvēršanu"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "At_dalīt cilni"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3769,100 +3689,100 @@ msgstr "Istaba"
 msgid "Auto-Connect"
 msgstr "Autom�tiski savienoties"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "P�rvaldīt iecienīt�s istabas"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Ien�košais video zvans"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Ien�košais zvans"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s pied�v� video zvanu. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s jums zvana. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Ien�košais zvans no %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "No_raidīt"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Atbildēt"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Atbildēt ar video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Ien�košais video zvans no %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Istabas ielūgums"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Ielūgums pievienoties %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s jūs ielūdz pievienoties %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "Norai_dīt"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Pievienoties"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Pien�k fails no %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Nepieciešama parole"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vēlas saņemt atļauju redzēt tavu tiešsaistes statusu"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3872,105 +3792,105 @@ msgstr ""
 "Ziņojums: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s no %s ar �trumu %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s no %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Saņem \"%s\" no %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sūta \"%s\" lietot�jam %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Kļūda, saņemot \"%s\" no %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Kļūda, saņemot failu"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Kļūda, sūtot \"%s\" lietot�jam %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Kļūda, sūtot failu"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" saņemts no %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" aizsūtīts lietot�jam %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Faila p�rsūtīšana pabeigta"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Gaida otra dalībnieka atbildi"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "P�rbauda \"%s\" integrit�ti"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Jauc \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fails"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Atlicis"
 
@@ -3983,7 +3903,12 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Izņemt pabeigtos, atceltos un neizdevušos failu p�rsūtījumus no saraksta"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Importēt"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3991,171 +3916,196 @@ msgstr ""
 "Nav atrasti importējamie konti. Empathy pagaid�m atbalsta tikai Pidgin kontu "
 "importēšanu."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importēt kontus"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importēt"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokols"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Avots"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Pied�v�t paroli"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Atvienot"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Lai šeit redzētu kontaktus, j�iestata konts."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nav atrastu rezult�tu"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Diemžēl %s kontus nevar izmantot, kamēr %s programmatūra nav atjaunin�ta."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Atjaunin�t programmatūru..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Savienoties atkal"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Rediģēt kontu"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Aizvērt"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Uzpildīt %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Uzpildīt konta kredītu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Uzpildīt ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakts"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Lai šeit redzētu kontaktus, jums j�aktivē k�ds no saviem kontiem."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Lai šeit redzētu kontaktus, jums j�aktivē %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktu saraksts"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakti uz _kartes"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Konta iestatījumi"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Kredīta bilance"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Jau_na saruna..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Mek_lēt kontaktu sarakst�"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Jauns _zvans..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pievienoties _iecienītaj�m"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Meklēt kontaktu..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "P�rvaldīt iecienīt�s"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Failu p�rsūtīšana"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_orm�ls izmērs"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nesaistes k_ontakti"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Jauns _zvans..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_R�dīt protokolus"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Norm�ls izmērs ar _attēliem"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Kredīta bilance"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakti uz _kartes"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Konti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_BloÄ·Ä“tie kontakti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Iestatījumi"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_R�dīt protokolus"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Mek_lēt kontaktu sarakst�"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "K�rtot pēc _v�rda"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "K�rtot pēc _statusa"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Konti"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Norm�ls izmērs ar _attēliem"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_BloÄ·Ä“tie kontakti"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_orm�ls izmērs"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakts izmērs"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Failu p�rsūtīšana"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Istaba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Pievienoties..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Jau_na saruna..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nesaistes k_ontakti"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personīg� inform�cija"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Istaba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Pievienoties _iecienītaj�m"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Meklēt kontaktu..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "P�rvaldīt iecienīt�s"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Tērzēšanas istaba"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Dalībnieki"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4168,22 +4118,27 @@ msgstr ""
 "Nepieciešama parole: %s\n"
 "Dalībnieki: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "J�"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "NÄ“"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Neizdev�s palaist istabu izdruku"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Neizdev�s apst�din�t istabu izdruku"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Neizdev�s iel�dēt istabu sarakstu"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pievienoties istabai"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4192,6 +4147,10 @@ msgstr ""
 "Ierakstiet šeit istabas v�rdu, kurai pievienoties, vai klikšķiniet sarakst�."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Istaba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4199,180 +4158,196 @@ msgstr ""
 "Ievadiet serveri, kurš uztur istabu, vai arī atst�jiet tukšu, ja istaba ir "
 "uz pašreizēj� konta servera"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pievienoties istabai"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Neizdev�s iel�dēt istabu sarakstu"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Istabu saraksts"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Istaba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Ziņojums saņemts"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Ziņojums nosūtīts"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Jauna saruna"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Kontakts par�d�s tiešsaistē"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakts devies nesaistē"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konts savienots"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konts atvienots"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Valoda"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Spīdola"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "L��plēsis"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "L��plēsi, mainies uz augšu, ne šis ir tavs darbs!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Tev liel�ks darbs: priekš tautas dzīvot, ne mirt!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ar viltu tie kaitina tevi uz cīņu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Mainoties uz augšu, tu likteni p�rspēsi!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Es lūstu, kad mainos; es gatavs no s�kta gala."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Spīdola izg�ja"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "R�dīt _smaidiņus k� bildes "
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "R�dīt kontaktu _sarakstu istab�s"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izskats"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Uzvedība"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "S�kt tērzēšanu:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Tērzēšanas t_ēma:"
+msgid "new ta_bs"
+msgstr "jaun�s _cilnēs"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Atslēgt paziņojumus, kad prom vai _aizņemts"
+msgid "new _windows"
+msgstr "jaunos _logos"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Atslēgt skaņu, kad prom vai _aizņemts"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "R�dīt ien�košos notikumus paziņojumu lauk�"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Autom�tiski savienoties palaižoties "
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Atbalss atcelšana palīdz padarīt balss skaņu skaidr�ku otrai personai, bet "
-"var radīt problēmas uz dažiem datoriem. Ja jūs vai k�ds cits zvana laik� "
-"dzird dīvainas skaņas vai citas problēmas, pamēģiniet izslēgt atbalss "
-"atcelšanu un p�rstartējiet zvanu."
+msgid "Log conversations"
+msgstr "Reģistrēt sarunas"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Ieslēgt paziņojumus, kad kontakts par�d�s tiešsaistē"
+msgid "Behavior"
+msgstr "Uzvedība"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Ieslēgt paziņojumus, kad kontakts dodas nesaistē"
+msgid "General"
+msgstr "Visp�rīgi"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Ieslēgt paziņojumus, kad _tērzēšana nav fokusēta"
+msgid "_Enable bubble notifications"
+msgstr "I_eslēgt burbuļpaziņojumus"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Ieslēgt pareizrakstības p�rbaudi valodai:"
+msgid "Disable notifications when _away or busy"
+msgstr "Atslēgt paziņojumus, kad prom vai _aizņemts"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Visp�rīgi"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Ieslēgt paziņojumus, kad _tērzēšana nav fokusēta"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ievades līmenis:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Ieslēgt paziņojumus, kad kontakts par�d�s tiešsaistē"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Ievades skaļums:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Ieslēgt paziņojumus, kad kontakts dodas nesaistē"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Paziņojumi"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Vietas avoti:"
+msgid "_Enable sound notifications"
+msgstr "I_eslēgt skaņas paziņojumus"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Reģistrēt sarunas"
+msgid "Disable sounds when _away or busy"
+msgstr "Atslēgt skaņu, kad prom vai _aizņemts"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Paziņojumi"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Atskaņot skaņu pie notikumiem"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Skaņas"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Priv�tums"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Li_etot atbalss atcelšanu, lai uzlabotu zvana kvalit�ti"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Atbalss atcelšana palīdz padarīt balss skaņu skaidr�ku otrai personai, bet "
+"var radīt problēmas uz dažiem datoriem. Ja jūs vai k�ds cits zvana laik� "
+"dzird dīvainas skaņas vai citas problēmas, pamēģiniet izslēgt atbalss "
+"atcelšanu un p�rstartējiet zvanu."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Par�dīt kontaktiem atrašan�s vietu"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
@@ -4381,190 +4356,198 @@ msgstr ""
 "štats un valsts netiks publicēts. GPS koordin�tes būs precīzas līdz vienai "
 "zīmei aiz komata."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "R�dīt _smaidiņus k� bildes "
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "R�dīt kontaktu _sarakstu istab�s"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Skaņas"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Pareizrakstības p�rbaude"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Valodu saraksts r�da tikai t�s valodas, kur�m ir instalētas v�rdnīcas."
-
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "TÄ“mas"
+msgid "_Reduce location accuracy"
+msgstr "Samazin�t atrašan�s vietas p_recizit�ti"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variants:"
+msgid "Privacy"
+msgstr "Priv�tums"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Autom�tiski savienoties palaižoties "
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilais t�lrunis"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "I_eslēgt burbuļpaziņojumus"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_TÄ«kls (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "I_eslēgt skaņas paziņojumus"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Vietas avoti:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_TÄ«kls (IP, Wi-Fi)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Valodu saraksts r�da tikai t�s valodas, kur�m ir instalētas v�rdnīcas."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "Atvērt jaunas sarakstes atsevišķos l_ogos"
+msgid "Enable spell checking for languages:"
+msgstr "Ieslēgt pareizrakstības p�rbaudi valodai:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Par�dīt kontaktiem atrašan�s vietu"
+msgid "Spell Checking"
+msgstr "Pareizrakstības p�rbaude"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Tērzēšanas t_ēma:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Samazin�t atrašan�s vietas p_recizit�ti"
+msgid "Variant:"
+msgstr "Variants:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "TÄ“mas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Statuss"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Iziet"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zvanīt kontaktam vēlreiz"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Izslēgt kameru"
+msgid "Redial"
+msgstr "Zvanīt atkal"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Ieslēgt kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Izslēgt video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Atslēgt kameru un p�rst�t sūtīt video"
+msgid "Video Preview"
+msgstr "Video priekšskatījums"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ieslēgt kameru un sūtīt video"
+msgid "Video On"
+msgstr "Ieslēgt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ieslēgt kameru, bet nesūtīt video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Zvanīt kontaktam vēlreiz"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Priekšskatījums"
+msgid "Camera Off"
+msgstr "Izslēgt kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Zvanīt atkal"
+msgid "Disable camera and stop sending video"
+msgstr "Atslēgt kameru un p�rst�t sūtīt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Priekšskatījums"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Izslēgt video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Ieslēgt kameru, bet nesūtīt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Ieslēgt video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Ieslēgt kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video priekšskatījums"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Ieslēgt kameru un sūtīt video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktu kartes skats"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Saglab�t"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin saite"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin atbilde"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datu ir p�r�k daudz, lai ielīmētu vien� solī. Lūdzu, saglab�jiet žurn�lu "
+"fail�."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Atkļūdošanas logs"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Sūtīt uz pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "LÄ«menis "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Atkļūdošanas"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Inform�cijas"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Paziņojuma"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Brīdin�juma"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritiskais"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Kļūdas"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Laiks"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domēns"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "LÄ«menis"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4572,133 +4555,435 @@ msgstr ""
 "Izvēlētais savienojumu p�rvaldnieks neatbalsta att�lin�to atkļūdošanas "
 "paplašin�jumu."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Ielūgt dalībnieku"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izvēlieties kontaktu, ko aicin�t uz sarunu:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Uzaicin�t"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ner�dīt nek�dus dialogus; izdarīt dar�mo (piemēram, importēšanu) un iziet"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ner�dīt nek�dus dialogus, izņemot, ja ir tikai \"Tuvum� esošie cilvēki\" "
 "konti"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "S�kum� izvēlēties doto kontu (piemēram, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konta-ID>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr " - Empathy konti"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy konti"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "R�dīt noteiktu servisu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy atkļūdot�js"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy atkļūdot�js"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy tērzēšanas klients"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Atbildēt"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Noraidīt"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Atbildēt"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Atbildēt ar video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Noraidīt"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Pieņemt"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Pied�v�t"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tikko mēģin�ja piezvanīt, bet jūs jau piedalīj�ties cit� sarun�."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Aizturēts"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Apklusin�t"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Ilgums"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Jūsu pašreizēj� bilance ir %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Diemžēl jums nepietiek kredīta, lai veiktu šo zvanu."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Uzpildīt"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Reģistru sakritība"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "K�da veida tērzēšanas konts jums ir?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Jauna kontu pievienošana"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Tuvum� esošie cilvēki"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy var autom�tiski atrast tērzēšanai cilvēkus jūsu lok�laj� tīkl�. Ja "
+"vēlaties lietot šo iespēju, lūdzu, p�rliecinieties, ka nor�dīt� inform�cija "
+"ir "
+"pareiza"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Jūs varat mainīt šo inform�ciju vēl�k vai deaktivēt šo iespēju, izvēloties "
+"<span style=\"italic\">Rediģēt → Konti</span> kontaktu sarakst�."
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izvēlēties kontaktus, ko saistīt"
+
+#~ msgid "New contact preview"
+#~ msgstr "Jauna kontakta priekšskatījums"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Kontakti, kuri ir izvēlēti kreisaj� sarakst� tiks sasaistīti"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Saistīt kontaktus..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Saistītie kontakti"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "A_tsaistīt..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Redzamo saistīto kontaktu pilnīb� sadalīt atsevišķos kontaktos."
+
+#~ msgid "_Link"
+#~ msgstr "_Saistīt"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Atsaistīt saistītos kontaktus '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Vai tieš�m vēlaties atsaistīt šos saistītos kontaktus? Tas pilnīb� "
+#~ "sadalīs saistītos kontaktus daž�dos kontaktos."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "A_tsaistīt"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Gadīj�s kļūda, importējot kontus."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Gadīj�s kļūda, analizējot konta inform�ciju."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Gadīj�s kļūda, veidojot kontu."
+
+#~ msgid "There was an error."
+#~ msgstr "Ir notikusi kļūda."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Kļūdas paziņojums: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Jūs varat atgriezties un ievadīt konta inform�ciju vēlreiz, vai arī iziet "
+#~ "no šī palīga un pievienot kontus vēl�k, izmantojot Rediģēšanas izvēlni."
+
+#~ msgid "An error occurred"
+#~ msgstr "Notika kļūda"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Ievadiet sava konta inform�ciju"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "K�da veida tērzēšanas kontu vēlaties izveidot?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Ievadiet sava jaun� konta inform�ciju"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Ar Empathy jūs varat tērzēt ar tuvum� esošiem cilvēkiem, k� arī ar "
+#~ "draugiem un kolēģiem, kuri izmanto Google Talk, AIM, Windows Live un "
+#~ "daudzas citas tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs "
+#~ "varat veikt arī audio un video zvanus."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "J�, importēt konta inform�ciju no"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "J�, es tagad ievadīšu sava konta inform�ciju"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nē, es vēlos veidot jaunu kontu"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nē, es pagaid�m vēlos tikai redzēt tuvum� atrodamos cilvēkus"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izvēlieties kontus, kurus vēlaties importēt:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nē, pagaid�m tas ir viss"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Rediģēt->Konti"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Es pagaid�m _nevēlos ieslēgt šo iespēju"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Neizdosies tērzēt ar cilvēkiem lok�laj� tīkl�, jo telepathy-salut nav "
+#~ "instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet telepathy-"
+#~ "salut pakotni un izveidojiet atbilstošo kontu Kontu dialog�"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Ziņojumapmaiņas un IP balss p�rraides kontu asistents"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Laipni lūdzam Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importēt jau esošos kontus"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "LÅ«dzu, ievadiet savus datus"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokols:"
+
+#~| msgid "Show Balance in contact list"
+#~ msgid "Show account assistant"
+#~ msgstr "R�dīt kontu asistentu"
+
+#~ msgid "Call volume"
+#~ msgstr "Zvana skaļums"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Zvana skaļums, izteikts procentos."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy ir p�rnesusi butterfly žurn�lus"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Vai Empathy ir p�rnesusi butterfly žurn�lus."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Ligzdas tips nav atbalstīts"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mani tīmekļa konti"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Konts %s tika rediģēts ar %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontu %s nevar rediģēt, izmantojot Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Palaist \"Mani tīmekļa konti\""
+
+#~ msgid "Edit %s"
+#~ msgstr "Rediģēt %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "A_tcelt"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personīg� inform�cija"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupēts"
+
+#~ msgid "Favorite People"
+#~ msgstr "Īpašie cilvēki"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "R_ediģēt"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izvēlēties kontaktu"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakta ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Tērzēt"
+
+#~ msgid "Send _Video"
+#~ msgstr "Sūtīt _video"
+
+#~ msgid "C_all"
+#~ msgstr "Zv_anīt"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Iestatiet savu kl�tbūtni un statusu"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izvēlētais kontakts nevar saņemt failus."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izvēlētais kontakts ir nesaistē."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Jūs tūlīt izveidosiet jaunu kontu, kas izmetīs jūsu izmaiņas.\n"
+#~ "Vai tieš�m vēlaties turpin�t?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezin�ms"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezin�ms"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezin�ms"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezin�ms"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personīg� inform�cija"
+
+#~ msgid "Input level:"
+#~ msgstr "Ievades līmenis:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Ievades skaļums:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Atvērt jaunas sarakstes atsevišķos l_ogos"
+
 #~ msgid "Find Next"
 #~ msgstr "Meklēt n�kamo"
 
diff --git a/po/nb.po b/po/nb.po
index b35b7a09a..53ddba817 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,4 +1,4 @@
-# Norwegian (bokmål) translation of empathy.
+# Norwegian bokmål translation of empathy.
 # Copyright © 2003-2005 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2003-2012.
 # Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:05+0100\n"
-"PO-Revision-Date: 2012-01-16 17:07+0100\n"
+"POT-Creation-Date: 2012-03-12 18:24+0100\n"
+"PO-Revision-Date: 2012-03-12 18:26+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -34,6 +33,16 @@ msgstr "Empathy internettmeldinger"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Meldings- og VoIP-kontoer"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "HÃ¥ndter meldings- og VoIP-kontoer"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
 msgstr "Tilkoblingshåndterer skal brukes"
@@ -71,75 +80,85 @@ msgid "The default folder to save file transfers in."
 msgstr "Forvalgt mappe for lagring av filoverføringer."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magisk nummer som brukes til å sjekke om oppryddingsoppgaver skal kjøres"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr "empathy-sanity-cleaning.c bruker dette tallet til å sjekke om oppryddingsoppgaver skal kjøres eller ikke. Brukere skal ikke endre dette manuelt."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Show offline contacts"
 msgstr "Vis frakoblede kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Show avatars"
 msgstr "Vis personbilder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Show Balance in contact list"
 msgstr "Vis saldo i kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Whether to show account balances in the contact list."
 msgstr "Om saldo for konto skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt modus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Hide main window"
 msgstr "Skjul hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Default directory to select an avatar image from"
 msgstr "Forvalgt mappe for personbilde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den forrige mappen et personbilde ble valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "Ã…pne nye samtaler i egne vinduer"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Always open a separate chat window for new chats."
 msgstr "Alltid åpne et eget vindu til nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Display incoming events in the status area"
 msgstr "Vis innkommende hendelser i statusområdet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -147,125 +166,133 @@ msgstr ""
 "Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
 "til bruker med det samme."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "The position for the chat window side pane"
 msgstr "Posisjon for pratevinduets sidelinje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to show groups in the contact list."
+msgstr "Om kontaktgrupper skal vises i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterier for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
-"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil "
-"kontaktlisten sorteres etter kontaktens tilstand."
+"å sortere kontakter etter kontaktens tilstand med verdien «state». Hvis man "
+"bruker «name» vil kontaktlisten sorteres etter kontaktens navn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Use notification sounds"
 msgstr "Bruk varslingslyder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play a sound to notify of events."
 msgstr "Om lyder skal spilles av for å varsle om hendelser."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Disable sounds when away"
 msgstr "Slå av lyder når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Spill av lyd når meldinger kommer inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Spill av lyd for utgående meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
 "nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when a contact logs out"
 msgstr "Spill av lyd når kontakter logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log in"
 msgstr "Spill av lyd når du logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging into a network."
 msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Play a sound when we log out"
 msgstr "Spill av lyd når du logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Enable popup notifications for new messages"
 msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om varsling skal vises når en ny melding mottas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Disable popup notifications when away"
 msgstr "Slå av varsling når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Om varsling skal vises når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vis varsling når prat ikke er fokusert"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -273,105 +300,117 @@ msgstr ""
 "Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
 "men ikke har fokus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vis varsling når en kontakt logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om et varsel skal vises når en kontakt er kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vis varsling når en kontakt logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om varsel skal vises når en kontakt kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Vis smilefjes grafisk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Om kontaktlisten skal vises i praterom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme"
 msgstr "Tema for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Temaet som brukes til å vise samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Chat window theme variant"
 msgstr "Temavariant for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Path of the Adium theme to use"
 msgstr "Sti til Adium-tema som skal brukes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå på utviklerverktøy for WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informer andre brukere når du skriver til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Hvorvidt tilstand for «skriver» eller «pause» i prat skal sendes. Påvirker "
+"ikke status «borte»."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Use theme for chat rooms"
 msgstr "Bruk tema for samtalerom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om tema skal brukes for praterom eller ikke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Spell checking languages"
 msgstr "Stavekontrollspråk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Enable spell checker"
 msgstr "Bruk stavekontroll"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Nick completed character"
 msgstr "Tegn for fullføring av kallenavn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -379,54 +418,54 @@ msgstr ""
 "Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
 "tabulator benyttes i gruppeprat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Last account selected in Join Room dialog"
 msgstr "Siste konto valgt i dialogen «Bli med i rom»"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera device"
 msgstr "Kameraenhet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Camera position"
 msgstr "Kameraposisjon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Position the camera preview should be during a call."
 msgstr "Posisjon for kameraforhåndsvisning under en samtale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Echo cancellation support"
 msgstr "Støtte for utlikning av ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Show hint about closing the main window"
 msgstr "Vis hint om lukking av hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -434,103 +473,93 @@ msgstr ""
 "Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
 "vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publisere brukers plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Om Empathy kan publisere brukers plassering til kontakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan bruke nettverket til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan bruke GPS til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Om Empathy kan bruke GPS for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Meldings- og VoIP-kontoer"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "HÃ¥ndter meldings- og VoIP-kontoer"
-
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverføring fullført, men filen ble korrupt"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverføring støttes ikke av ekstern kontakt"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Tapt anrop fra %s"
@@ -546,139 +575,139 @@ msgstr "Samtale med %s"
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Denne ressursen er allerede koblet til tjeneren"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne kontoen er allerede koblet til tjeneren"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -686,78 +715,96 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern feil"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Passordet ble ikke funnet"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Passord for lynmeldingskonto for %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Passord for praterom «%s» på konto %s (%s)"
+
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle kontoer"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
@@ -775,30 +822,30 @@ msgstr "Tjener"
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
@@ -807,19 +854,19 @@ msgstr "Lag en ny konto på tjeneren"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -1273,65 +1320,65 @@ msgstr "Alle filer"
 msgid "Click to enlarge"
 msgstr "Klikk for å forstørre"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Valgt kontakt støtter ikke oppringing"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Valgt kontakt er koblet fra"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Valgt kontakt er ugyldig"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Du har ikke nok kreditt til å starte denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1339,23 +1386,23 @@ msgstr ""
 "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1365,11 +1412,11 @@ msgstr ""
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1377,120 +1424,126 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ikke nok kreditt til å sende melding. <a href='%s'>Fyll på</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
-msgstr "Emnet er satt til: %s"
+msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne satt av %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1498,12 +1551,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1511,17 +1564,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1531,17 +1584,17 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1549,80 +1602,80 @@ msgstr "%s er nå kjent som %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Ukjent eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokkering av kontakter midlertidig utilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blokkering av kontakter er ikke tilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Kunne ikke blokkere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Rediger blokkerte kontakter"
 
@@ -1665,33 +1718,29 @@ msgstr "_Ã…pne lenke"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Personlig informasjon"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1864,7 +1913,7 @@ msgstr "Høyde:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sted"
 
@@ -1890,6 +1939,16 @@ msgstr "Lagre personbilder"
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullt navn"
@@ -1972,11 +2031,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Plassering</b> (dato)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Kontaktdetaljer"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -1998,11 +2052,11 @@ msgstr "Versjon:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2010,17 +2064,17 @@ msgstr ""
 "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere "
 "eller ingen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2040,156 +2094,140 @@ msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Koblede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Velg kontakter som skal kobles"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Forhåndsvisning av ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Prat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installert"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "Koble kontakter …"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2198,7 +2236,7 @@ msgstr ""
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
@@ -2242,178 +2280,135 @@ msgstr "ny tjener"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Koble kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Fjern kobling …"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Del opp vist lenket kontakt i kontaktene den inneholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Koble"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Fjern kobling for lenkede kontakter «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil fjerne kobling for disse lenkede kontaktene? Dette "
-"vil dele de lenkede kontaktene opp i enkelte kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Fjern kobling"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minutt"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "NÃ¥r som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "NÃ¥r"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2499,7 +2494,7 @@ msgid "There was an error starting the conversation"
 msgstr "Det oppsto en feil ved start av samtalen"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Oppgi en kontaktidentifikator eller telefonnummer:"
 
@@ -2509,17 +2504,17 @@ msgid "New Conversation"
 msgstr "Ny samtale"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Ny samtale"
 
@@ -2575,7 +2570,7 @@ msgstr "Egendefinerte meldinger …"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
@@ -2644,12 +2639,12 @@ msgstr "Samtale avsluttet"
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2727,34 +2722,38 @@ msgid "Certificate hostname: %s"
 msgstr "Vertsnavn i sertifikat: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsett"
+msgid "C_ontinue"
+msgstr "F_ortsett"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Tilkobling uten tillit"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valget for fremtidige tilkoblinger"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Sertifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2763,7 +2762,7 @@ msgstr ""
 "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
 "Vennligst velg en annen lokasjon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
@@ -2943,23 +2942,23 @@ msgstr "Ingen feilmelding"
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3017,231 +3016,83 @@ msgstr ""
 "Espen Stefansen\n"
 "Torstein Adolf Winterseth <kvikende@fsfe.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det oppsto en feil under import av kontoene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det oppsto en feil under innlesing av detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det oppsto en feil under oppretting av kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det oppsto en feil."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Feilmeldingen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbake og prøve å oppgi detaljer for kontoen igjen eller "
-"avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "En feil oppsto"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type konto har du?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Oppgi detaljer for konto"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type lynmeldingskonto vil du lage?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Vil du lage flere lynmeldingskontoer?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Oppgi detaljer for den nye kontoen"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy lar deg prate med folk på nettverk i nærheten og med venner og "
-"kolleger som bruker Google Talk, AIM, Windows Live og mange andre "
-"prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
-"lyd- og bildesamtaler."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Ja, importer mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Nei, jeg vil ha en ny konto"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Velg kontoer du vil importere:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Nei, det var alt for nå"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
-"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
-"under er riktige. Du kan lett endre disse detaljene senere eller slå av "
-"funksjonen i «Konto»-dialogen"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Rediger->Kontoer"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil ikke slå på de_nne funksjonen nå"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne prate med personer som er koblet på ditt lokale nettverk "
-"siden telepathy-salut ikke er installert. Hvis du vil slå på denne "
-"funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
-"nærheten»-konto i Konto-dialogen"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installert"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meldings- og VoIP-kontoer"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importer dine eksisterende kontoer"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Vennligst oppgi personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Denne kontoen har blitt deaktivert fordi den er avhengig av en gammel motor "
+"som ikke støttes. Vennligst installer telepathy-haze og start økten på nytt "
+"for å migrere kontoen."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:574
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:739
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:745
 msgid "Go online to edit your personal information."
 msgstr "Rediger din personlige informasjon på nettet."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:830
 msgid "_Edit Connection Parameters..."
 msgstr "R_ediger parametere for tilkoblingen …"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,15 +3101,23 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "Slå _på"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "Slå _av"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Hopp over"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Koble til"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3275,8 +3134,8 @@ msgid "_Import…"
 msgstr "_Importer …"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Laster kontoinformasjon"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3287,123 +3146,115 @@ msgstr ""
 "til en ny konto."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Ingen protokoll installert"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Laster kontoinformasjon"
+msgid "No protocol backends installed"
+msgstr "Ingen protokollmotor installert"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentiseringsklient"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i nærheten"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Sidelinje"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Lydinngang"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Videoinngang"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Nummertavle"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detaljer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adresse for peer som sett av andre siden"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3412,8 +3263,8 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3422,8 +3273,8 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3432,29 +3283,29 @@ msgstr ""
 "Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
 "ikke tillater direkte tilkoblinger."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3465,23 +3316,23 @@ msgstr ""
 "\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
@@ -3503,23 +3354,23 @@ msgid "_Settings"
 msgstr "Inn_stillinger"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Vis"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Innhold"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Feilsøk"
 
@@ -3594,8 +3445,8 @@ msgstr "Kodek for koding:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -3614,51 +3465,100 @@ msgstr "Ekstern kandidat:"
 msgid "Local Candidate:"
 msgstr "Lokal kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Lukk dette vinduet?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
+"meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Hvis du lukker dette vinduet vil du forlate praterommet. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+msgstr[1] ""
+"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlat %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
+"igjen."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Lukk vindu"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlat rom"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulest)"
 msgstr[1] "%s (%d uleste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u annen)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulest fra andre)"
 msgstr[1] "%s (%d uleste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulest fra alle)"
 msgstr[1] "%s (%d uleste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d melding"
 msgstr[1] "Sender %d meldinger"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3738,96 +3638,96 @@ msgstr "Koble til automatisk"
 msgid "Manage Favorite Rooms"
 msgstr "HÃ¥ndter favorittrom"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ringer deg med video. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Av_vis"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "Sv_ar"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Innkommende videosamtale fra %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitasjon til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterte deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du har blitt invitert til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3947,86 +3847,108 @@ msgstr "Filoverføringer"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "Fant ingen kontoer å importere. Empathy støtter kun import fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du må sette opp en konto for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Rediger konto"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll opp %s (%s) …"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll opp kreditt for konto"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll opp …"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du må slå på en av kontoene for å se kontakter her."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Du må slå på %s for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Innstillinger for konto"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4066,54 +3988,50 @@ msgid "_Accounts"
 msgstr "_Kontoer"
 
 #: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Personlig _informasjon"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokkerte kontakter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "B_rukervalg"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "Finn i kontakt_liste"
 
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sorter på _navn"
 
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sorter på _status"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _avatarer"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Rom"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Bli med …"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
 msgstr "Bli med i _favoritter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
 msgstr "HÃ¥ndter favoritter"
 
@@ -4142,6 +4060,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nei"
 
@@ -4197,7 +4120,7 @@ msgid "New conversation"
 msgstr "Ny samtale"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
 #: ../src/empathy-preferences.c:170
@@ -4217,46 +4140,46 @@ msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4273,74 +4196,82 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "_Ã…pne nye samtaler i egne vinduer"
+msgid "Start chats in:"
+msgstr "Start prat om:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "nye fa_ner"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
 msgstr "Vis innkommende hendelser i varslingsområdet"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
 msgstr "Koble til _automatisk ved oppstart"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Logg samtaler"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
 msgstr "_Aktiver varsling med bobler"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
 msgstr "Slå av varsling når du er borte eller oppt_att"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktiver varsling når _prat ikke er fokusert"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
 msgstr "Slå på varsling når en kontakt kobler seg til"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
 msgstr "Slå på varsling når en kontakt kobler seg fra"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Varsling"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Slå av lyder når du er b_orte eller opptatt"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Spill av lyd for hendelser"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4352,11 +4283,11 @@ msgstr ""
 "den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
 "slå av utlikning av ekko og starte samtalen på nytt."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publiser plassering til mine kontakter"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4366,54 +4297,54 @@ msgstr ""
 "publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
 msgstr "_Reduser nøyaktighet for plassering"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nettverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Kilder for steder:"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Listen med språk viser bare de språkene det er installert ordliste for."
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Slå på stavekontroll for språk:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Samtale_tema:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temaer"
 
@@ -4477,111 +4408,130 @@ msgstr "Slå på kamera og send video"
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Lenke til Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Svar fra Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Data for stor for en enkel klipp-og-lim operasjon. Vennligst lagre loggene "
+"til en fil."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Send til Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
 "kontoer"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Vis kontoassistent"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
@@ -4597,85 +4547,85 @@ msgstr "- Empathy feilsøking"
 msgid "Empathy Debugger"
 msgstr "Empathy feilsøking"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Svar med video"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Godta"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Oppgi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "PÃ¥ vent"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Du har ikke nok kreditt til å starte denne samtalen."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Fyll opp"
 
@@ -4683,6 +4633,32 @@ msgstr "Fyll opp"
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type konto har du?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Legger til ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i nærheten"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
+"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
+"under er riktige."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Du kan endre disse detaljene senere eller slå av denne funksjonen ved å "
+"velge <span style=\"italic\">Rediger → Kontoer</span> i kontaktlisten."
diff --git a/po/pa.po b/po/pa.po
index be7087f8e..1837d127a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2009.
-# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011.
+# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-15 13:17+0000\n"
-"PO-Revision-Date: 2011-09-18 08:55+0530\n"
+"POT-Creation-Date: 2012-02-21 15:03+0000\n"
+"PO-Revision-Date: 2012-02-23 20:57+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -24,490 +24,534 @@ msgstr ""
 "Language: pa\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "ਗੂਗਲ ਟਾਕ, ਫੇਸਬ�ੱਕ, MSN ਤੇ ਹੋਰ ਕਈ ਚੈੱਟ ਸਰਵਿਸਾਂ ਉੱਤੇ ਗੱਲਾਂ ਕਰੋ"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "ਇੰਪੈਥੀ"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM ਕਲਾਇਟ"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "ਇੰਪੈਥੀ ਇੰਟਰਨੈੱਟ ਮੈੱਸਜ਼ਿੰਗ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM ਕਲਾਇਟ"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "ਗੂਗਲ ਟਾਕ, ਫੇਸਬ�ੱਕ, MSN ਤੇ ਹੋਰ ਕਈ ਚੈੱਟ ਸਰਵਿਸਾਂ ਉੱਤੇ ਗੱਲਾਂ ਕਰੋ"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
+msgid "Connection managers should be used"
+msgstr "ਕ�ਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "ਕਾਲ ਆਵਾਜ਼"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "ਕੀ ਕ�ਨੈਕ�ਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕ�ਨੈਕਟ/ਮ�ੜ-ਕ�ਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "ਕਾਲ ਆਵਾਜ਼, ਫੀਸਦੀ ਵਜੋਂ।"
+msgid "Empathy should auto-connect on startup"
+msgstr "ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕ�ਨੈਕਟ ਹੋਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "ਕੈਮਰਾ ਜੰਤਰ"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤ�ਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "ਕੈਮਰਾ ਸਥਿਤੀ"
+msgid "Empathy should auto-away when idle"
+msgstr "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖਰ, ਜਦੋਂ ਗਰ�ੱਪ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾਂ ਪੂਰਾ ਕਰਨਾ ਹੋਵੇ (ਟੈਬ)"
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ਜੇ ਯੂਜ਼ਰ ਕ�� ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
+msgid "Empathy default download folder"
+msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ ਬਦਲ"
+msgid "The default folder to save file transfers in."
+msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
+msgid "Show offline contacts"
+msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾ� ਜਾਣ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "ਕ�ਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
+msgid "Show avatars"
+msgstr "ਅਵਤਾਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾ� ਜਾਣ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "ਵਿਡੀਓ ਕਾਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਕੈਮਰਾ ਜੰਤਰ, ਜਿਵੇਂ /dev/video0"
+msgid "Show protocols"
+msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾ� ਜਾਣ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਪੋਪਅੱਪ ਸੂਚਨਾ ਬੰਦ"
+msgid "Show Balance in contact list"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਤ�ਲਨ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਸਾਊਂਡ ਆਯੋਗ"
+msgid "Whether to show account balances in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਅਕਾਊਂਟ ਬਕਾਇਆ ਵੇਖਾਉਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
+msgid "Compact contact list"
+msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਲਈ ਜਾਣਕਾਰੀ ਵੇਖਾਉ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਉਹ ਯੂਜ਼ਰ ਨੂੰ "
-"ਤ�ਰੰਤ ਦਿਉ।"
+msgid "Whether to show the contact list in compact mode."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "ਈਚੋ ਰੱਦ ਕਰਨ ਸਹਿਯੋਗ"
+msgid "Hide main window"
+msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਦੇ ਸਕਦਾ ਹੈ"
+msgid "Hide the main window."
+msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "Default directory to select an avatar image from"
+msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਿਆ ਗਿਆ ਸੀ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "Open new chats in separate windows"
+msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
+msgid "Always open a separate chat window for new chats."
+msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
+msgid "Display incoming events in the status area"
+msgstr "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਲਈ ਜਾਣਕਾਰੀ ਵੇਖਾਉ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਉਹ ਯੂਜ਼ਰ ਨੂੰ "
+"ਤ�ਰੰਤ ਦਿਉ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕ�ਨੈਕਟ ਹੋਵੇ"
+msgid "The position for the chat window side pane"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "ਸੰਪਰਕ ਗਰ�ੱਪ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਗਰ�ੱਪ ਵੇਖਾਉਣੇ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "ਨਵੇਂ ਸ�ਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
+msgid "Contact list sort criterion"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ "
+"ਡਿਫਾਲਟ ਹਾਲਤ "
+"ਦੇ ਨਾਂ ਨਾਲ \"state (ਹਾਲਤ)\" ਹੈ। \"name (ਨਾਂ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮ�ਤਾਬਕ "
+"ਲੜੀਬੱਧ ਕਰੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ"
+msgid "Use notification sounds"
+msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
+msgid "Whether to play a sound to notify of events."
+msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
+msgid "Disable sounds when away"
+msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਸਾਊਂਡ ਆਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ�ੱ�ੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
+msgid "Play a sound for incoming messages"
+msgstr "ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚ�ਣਿਆ ਹੋਵੇ।"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ਕੀ ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Play a sound for outgoing messages"
+msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
+msgid "Play a sound for new conversations"
+msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Play a sound when a contact logs in"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀ� ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
+msgid "Play a sound when a contact logs out"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid "Play a sound when we log in"
+msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀ� ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid "Whether to play a sound when logging into a network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "ਕਾਲ ਦੇ ਦੌਰਾਨ �ਲਕ ਵੇਖਾਉਣ ਲਈ ਕੈਮਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+msgid "Play a sound when we log out"
+msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਤ�ਲਨ ਵੇਖੋ"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "ਅਵਤਾਰ ਵੇਖੋ"
+msgid "Enable popup notifications for new messages"
+msgstr "ਨਵੇਂ ਸ�ਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਮਿਲੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
+msgid "Disable popup notifications when away"
+msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਪੋਪਅੱਪ ਸੂਚਨਾ ਬੰਦ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰ�ੱ�ੇ ਹੋਵੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸ�ਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ "
+"ਪਹਿਲਾਂ ਖ�ੱਲ�ਹੀ ਹੋਵੇ, ਪਰ "
+"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
+msgid "Pop up notifications when a contact logs in"
+msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਿਆ ਗਿਆ ਸੀ।"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
+msgid "Pop up notifications when a contact logs out"
+msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
+msgid "Use graphical smileys"
+msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "ਥੀਮ ਬਦਲ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
+msgid "Show contact list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
+msgid "Chat window theme"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
+msgid "Chat window theme variant"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ ਬਦਲ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "ਥੀਮ ਬਦਲ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
+msgid "Path of the Adium theme to use"
+msgstr "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚ�ੱਕਿਆ ਹੈ।"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚ�ਣਿਆ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤ�ਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
+msgid "Enable WebKit Developer Tools"
+msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "ਜੇ ਯੂਜ਼ਰ ਕ�� ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ।"
+msgid "Inform other users when you are typing to them"
+msgstr "ਹੋਰ ਯੂਜ਼ਰ ਨੂੰ ਜਾਣਕਾਰੀ ਦਿਉ ਕਿ ਤ�ਸੀਂ ਉਹਨਾਂ ਲਈ ਲਿਖ ਰਹੇ ਹੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
+msgid "Use theme for chat rooms"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "ਕੀ ਕ�ਨੈਕ�ਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕ�ਨੈਕਟ/ਮ�ੜ-ਕ�ਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
+msgid "Whether to use the theme for chat rooms."
+msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "ਕੀ ਜਦੋਂ ਤ�ਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
+msgid "Spell checking languages"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "ਕੀ ਪਲੱਸਆਡੀਓ ਦਾ ਈਚੋ ਰੱਦ ਕਰਨ ਫਿਲਟਰ ਚਾਲੂ ਕਰਨਾ ਹੈ"
+msgid "Enable spell checker"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "ਕੀ ਜਦੋਂ ਤ�ਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid "Nick completed character"
+msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖਰ, ਜਦੋਂ ਗਰ�ੱਪ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾਂ ਪੂਰਾ ਕਰਨਾ ਹੋਵੇ (ਟੈਬ)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ਕੀ ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "Last account selected in Join Room dialog"
+msgstr "ਰੂਮ ਜ�ਆਇੰਨ ਡਾਈਲਗ ਲਈ ਆਖਰੀ ਵਾਰ ਚ�ਣਿਆ ਅਕਾਊਂਟ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid "Camera device"
+msgstr "ਕੈਮਰਾ ਜੰਤਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ�ੱ�ੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ਵਿਡੀਓ ਕਾਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਕੈਮਰਾ ਜੰਤਰ, ਜਿਵੇਂ /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
+msgid "Camera position"
+msgstr "ਕੈਮਰਾ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
+msgid "Position the camera preview should be during a call."
+msgstr "ਕਾਲ ਦੇ ਦੌਰਾਨ �ਲਕ ਵੇਖਾਉਣ ਲਈ ਕੈਮਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸ�ਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ "
-"ਪਹਿਲਾਂ ਖ�ੱਲ�ਹੀ ਹੋਵੇ, ਪਰ "
-"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
+msgid "Echo cancellation support"
+msgstr "ਈਚੋ ਰੱਦ ਕਰਨ ਸਹਿਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਮਿਲੇ।"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "ਕੀ ਪਲੱਸਆਡੀਓ ਦਾ ਈਚੋ ਰੱਦ ਕਰਨ ਫਿਲਟਰ ਚਾਲੂ ਕਰਨਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਅਕਾਊਂਟ ਬਕਾਇਆ ਵੇਖਾਉਣਾ ਹੈ।"
+msgid "Show hint about closing the main window"
+msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾ� ਜਾਣ।"
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸ�ਨੇਹਾ ਡਾਈਲਾਗ "
+"ਵੇਖਾਇਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾ� ਜਾਣ"
+msgid "Empathy can publish the user's location"
+msgstr "ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਦੇ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰ�ੱ�ੇ ਹੋਵੋ"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾ� ਜਾਣ।"
+msgid "Empathy can use the network to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸ�ਨੇਹਾ ਡਾਈਲਾਗ "
-"ਵੇਖਾਇਆ ਜਾਵੇ।"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ "
-"ਡਿਫਾਲਟ ਸੰਪਰਕ "
-"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮ�ਤਾਬਕ "
-"ਲੜੀਬੱਧ ਕਰੋ"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ।"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ਤ�ਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ�ਹ ਹੈ"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "ਅਣਜਾਣ ਕਾਰਨ"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ, ਪਰ ਫਾਇਲ ਖ਼ਰਾਬ ਸੀ"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "ਚ�ਣੀ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "ਚ�ਣੀ ਫਾਇਲ ਖਾਲੀ ਹੈ"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s ਤੋਂ ਮਿਸ ਹੋਈ ਕਾਲ "
@@ -523,169 +567,139 @@ msgstr "%s ਨੂੰ ਕਾਲ ਕੀਤੀ"
 msgid "Call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆਈ"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ਤ�ਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ�ਹ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ਰ��ੇ"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "ਦੂਰ"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤਾ"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ�ਹ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪ�ੱਗੀ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖ�ਦ-ਦਸਤਖਤੀ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "ਇਹ ਸਰੋਤ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕ�ਨੈਕਟ ਹੈ"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕ�ਨੈਕਟ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ਉਸੇ ਸਰੋਤ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕ�ਨੈਕਸ਼ਨ ਨੂੰ ਨਵੇਂ ਕ�ਨੈਕਸ਼ਨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "ਸਰਵਰ ਇਸ ਵੇਲੇ �ਨਾ ਰ�ੱ�ਿਆ ਹੋਇਆ ਹੈ ਕਿ ਕ�ਨੈਕਸ਼ਨ ਸੰਭਾਲ ਨਹੀਂ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚ�ੱਕਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "ਸਰਟੀਫਿਕੇਟ ਅਸ�ਰੱਖਿਅਤ ਸੀਫ਼ਰ �ਲਗੋਰਿਥਮ ਵਰਤਦਾ ਹੈ ਜਾਂ ਕਮਜ਼ੋਰ ਕ�ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -694,283 +708,263 @@ msgstr ""
 "ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
 "ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ਤ�ਹਾਡਾ ਸਾਫਟਵੇਅਰ ਬਹ�ਤ ਪ�ਰਾਣਾ ਹੈ"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "ਗੂਗਲ ਟਾਕ"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "ਫੇਸਬ�ੱਕ ਚੈਟ"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "ਭਵਿੱਖ ਵਿੱਚ"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ਸਰਵਰ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ਪੋਰਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "ਅਕਾਊਂਟ %s ਨੂੰ %s ਰਾਹੀਂ ਸੋਧਿਆ ਗਿਆ ਹੈ।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s ਬਦਲੋ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "ਲਾਗੂ ਕਰੋ(_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ਲਾਗਇਨ(_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "ਰੱਦ ਕਰੋ(_n)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ਉੱਤੇ %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>ਜਿਵੇਂ:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "ਪਾਸਵਰਡ(_w):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+msgid "Screen _Name:"
+msgstr "ਸਕਰੀਨ ਨਾਂ(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ਜਿਵੇਂ:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "ਪਾਸਵਰਡ(_w):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ਪੋਰਟ(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "ਸਕਰੀਨ ਨਾਂ(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "ਸਰਵਰ(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "ਤ�ਹਾਡਾ AIM ਪਾਸਵਰਡ ਕੀ ਹੈ?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ਤ�ਹਾਡਾ AIM ਸਕਰੀਨ ਨਾਂ ਕੀ ਹੈ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ਪੋਰਟ(_P):"
+msgid "What is your AIM password?"
+msgstr "ਤ�ਹਾਡਾ AIM ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "ਸਰਵਰ(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>ਜਿਵੇਂ ਕਿ:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ਲਾਗਇਨ I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>ਜਿਵੇਂ ਕਿ:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "ਤ�ਹਾਡਾ ਗਰ�ੱਪਵਾਈਜ਼ ਯੂਜ਼ਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "ਤ�ਹਾਡਾ ਗਰ�ੱਪਵਾਈਜ਼ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>ਜਿਵੇਂ:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ਅੱਖਰ ਸੈੱਟ(_a):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ਤ�ਹਾਡਾ ICQ UIN ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ਤ�ਹਾਡਾ ICQ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
@@ -1007,11 +1001,23 @@ msgstr "ਚੋਣਾਂ"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "ਨੈੱਟਵਰਕ"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "ਨੈੱਟਵਰਕ:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "ਅੱਖਰ ਸੈੱਟ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "ਸਰਵਰ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1020,14 +1026,6 @@ msgstr ""
 "ਹੋਵੇ ਤਾਂ ਪਾਸਵਰਡ "
 "ਨਾ ਦਿਉ।"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "ਨੈੱਟਵਰਕ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "ਨੈੱਟਵਰਕ:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ਨਾਂ:"
@@ -1044,48 +1042,20 @@ msgstr "ਬੰਦ ਕਰਨ ਸ�ਨੇਹਾ:"
 msgid "Real name:"
 msgstr "ਅਸਲੀ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "ਸਰਵਰ"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "ਤ�ਹਾਡਾ IRC ਨਾਂ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "ਕਿਹੜਾ IRC ਨੈੱਟਵਰਕ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>ਜਿਵੇਂ:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>ਜਿਵੇਂ:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਚਾਹੀਦੀ ਹੈ (TLS/SSL)(_y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ(_g)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "ਤਰਜੀਹ(_t):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "ਤ�ਹਾਡਾ IRC ਨਾਂ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "ਸਰੋਤ(_u):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "ਤ�ਹਾਡਾ ਫੇਸਬ�ੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1098,209 +1068,233 @@ msgstr ""
 "href=\"http://www.facebook.com/"
 "username/\">ਇਹ ਪੇਜ਼</a> ਵਰਤੋਂ।"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "ਪ�ਰਾਣੀ SS_L ਵਰਤੋਂ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "ਤ�ਹਾਡਾ ਫੇਸਬ�ੱਕ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "ਤ�ਹਾਡਾ ਫੇਸਬ�ੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "ਤ�ਹਾਡਾ ਗੂਗਲ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>ਜਿਵੇਂ:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "ਤ�ਹਾਡਾ ਗੂਗਲ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>ਜਿਵੇਂ:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ(_g)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "ਤਰਜੀਹ(_t):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "ਸਰੋਤ(_u):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਚਾਹੀਦੀ ਹੈ (TLS/SSL)(_y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "ਪ�ਰਾਣੀ SS_L ਵਰਤੋਂ"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ਤ�ਹਾਡਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "ਤ�ਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ਤ�ਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "ਤ�ਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ਤ�ਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>ਜਿਵੇਂ:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "ਤ�ਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "ਤ�ਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ਈਮੇਲ �ਡਰੈੱਸ(_m):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "ਨਾਂ(_k):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "ਆਖਰੀ ਨਾਂ(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "ਪਹਿਲਾਂ ਨਾਂ(_F): "
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "ਪਰਕਾਸ਼ਿਤ ਕੀਤਾ ਨਾਂ(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ਜੱਬਰ ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "ਆਖਰੀ ਨਾਂ(_L):"
+msgid "E-_mail address:"
+msgstr "ਈਮੇਲ �ਡਰੈੱਸ(_m):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "ਪਰਕਾਸ਼ਿਤ ਕੀਤਾ ਨਾਂ(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>ਜਿਵੇਂ:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "ਪਰਮਾਣਕਿਤ ਯੂਜ਼ਰਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "ਬਾਈਡਿੰਗ ਖੋਜ"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN ਸਰਵਰ ਆਟੋਮੈਟਿਕ ਹੀ ਲੱਭੋ"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਲੈਂਡਲਾਈਨ ਅਤੇ ਮੋਬਾਇਲ ਫੋਨ ਉੱਤੇ ਕਾਲ ਕਰਨ ਲਈ ਵਰਤੋਂ(_l)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ ਕਰੋ"
+msgid "NAT Traversal Options"
+msgstr "NAT ਟਰਾਂਸਵਰਸਲ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
+msgid "Proxy Options"
+msgstr "ਪਰਾਕਸੀ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "ਜਾਰੀ ਰੱਖਣ ਚੋਣਾਂ"
+msgid "Miscellaneous Options"
+msgstr "ਫ�ਟਕਲ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ਹਲਕਾ ਰੂਟਿੰਗ"
+msgid "STUN Server:"
+msgstr "STUN ਸਰਵਰ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "ਫੰਘ:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN ਸਰਵਰ ਆਟੋਮੈਟਿਕ ਹੀ ਲੱਭੋ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "ਫ�ਟਕਲ ਚੋਣਾਂ"
+msgid "Discover Binding"
+msgstr "ਬਾਈਡਿੰਗ ਖੋਜ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT ਟਰਾਂਸਵਰਸਲ ਚੋਣਾਂ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "ਸਰਵਰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "ਜਾਰੀ ਰੱਖਣ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ਪੋਰਟ:"
+msgid "Mechanism:"
+msgstr "ਫੰਘ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "ਪਰਾਕਸੀ ਚੋਣਾਂ"
+msgid "Interval (seconds)"
+msgstr "ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "ਪਰਮਾਣਕਿਤ ਯੂਜ਼ਰਨਾਂ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "ਟਰਾਂਸਪੋਰਟ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN ਸਰਵਰ:"
+msgid "Loose Routing"
+msgstr "ਹਲਕਾ ਰੂਟਿੰਗ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "ਸਰਵਰ:"
+msgid "Ignore TLS Errors"
+msgstr "TLS ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ ਕਰੋ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "ਟਰਾਂਸਪੋਰਟ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਲੈਂਡਲਾਈਨ ਅਤੇ ਮੋਬਾਇਲ ਫੋਨ ਉੱਤੇ ਕਾਲ ਕਰਨ ਲਈ ਵਰਤੋਂ(_l)"
+msgid "Port:"
+msgstr "ਪੋਰਟ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "ਤ�ਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ਤ�ਹਾਡਾ SIP ਲਾਗਇਨ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "ਤ�ਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "ਯਾਹੂ! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ(_g)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ਤ�ਹਾਡਾ ਯਾਹੂ! ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ਤ�ਹਾਡਾ ਯਾਹੂ! ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "ਯਾਹੂ! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "ਚਿੱਤਰ ਨਾ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ਕੋਈ ਵੀ ਮਨਜ਼ੂਰਸ਼�ਦਾ ਚਿੱਤਰ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਸਿਸਟਮ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "ਤਸਵੀਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "ਆਪਣਾ ਅਵਤਾਰ ਲੇਖ ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ਤਸਵੀਰ ਲਵੋ..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "ਚਿੱਤਰ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -1308,84 +1302,88 @@ msgstr "ਸਭ ਫਾਇਲਾਂ"
 msgid "Click to enlarge"
 msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "ਕਾਲ ਸ਼�ਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਕਾਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਸਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "ਇਹ ਪਰੋਟੋਕਾਲ ਉੱਤੇ �ਮਰਜੈਂਸੀ ਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "ਪ�ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ�ਹਣ ਲਈ ਫੇਲ�ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "ਇਹ ਗੱਲਬਾਤ ਲਈ ਵਿਸ਼ਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "ਤ�ਹਾਨੂੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ਇੱਕ ਠੀਕ ਸੰਪਰਕ ID ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਤੋਂ ਸਭ ਸ�ਨੇਹੇ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<chat room ID>] [<reason>]: ਚੈਟ ਰੂਮ ਛੱਡੋ, ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਮੌਜੂਦਾ ਇੱਕ ਹੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ਪ�ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ�ਹੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ਪ�ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ਮੌਜੂਦਾ ਸਰਵਰ ਉੱਤੇ ਆਪਣਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>:ਇੱਕ �ਕਸ਼ਨ ਸ�ਨੇਹਾ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1395,11 +1393,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1407,113 +1405,128 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "ਵਰਤੋਂ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ; ਉਪਲੱਬਧ ਕਮਾਂਡ ਵਾਸਤੇ ਮੱਦਦ ਲਈ /help ਵਰਤੋਂ"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਲਈ ਲੋੜੀਦਾ ਬਕਾਇਆ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "ਸ�ਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਲਈ ਲੋੜੀਦਾ ਬਕਾਇਆ ਨਹੀਂ ਹੈ। <a href='%s'>ਟਾਪ ਅੱਪ</a>।"
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ਸਮਰੱਥਾ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "ਆਫਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ਗਲਤ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "ਬਹ�ਤ ਲੰਮਾ ਸ�ਨੇਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ਸ�ਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "ਵਿਸ਼ਾ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "ਵਿਸ਼ਾ %s ਵਲੋਂ ਸੈੱਟ ਕੀਤਾ: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(ਕੋਈ ਸ��ਾਅ ਨਹੀਂ)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' ਨੂੰ %s ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "ਸਪੈਲਿੰਗ ਸ��ਾਅ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "ਤਾਜ਼ਾ ਲਾਗ ਲੈਣ ਲਈ ਫੇਲ�ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
@@ -1521,12 +1534,12 @@ msgstr "%s ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ਨੇ %1$s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
@@ -1534,17 +1547,17 @@ msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ਵਲੋਂ %1$s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
@@ -1554,17 +1567,17 @@ msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ਨੂੰ ਹ�ਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
@@ -1572,90 +1585,89 @@ msgstr "%s ਨੂੰ ਹà©�ਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗà¨
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2588
 msgid "Disconnected"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਖਤਮ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ ਪਾਸਵਰਡ ਸੰਭਾਲਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ਹ�ਣ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ਮ�ੜ-ਕੋਸ਼ਿਸ਼"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸ�ਰੱਖਿਅਤ ਹੈ:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "ਦਾਖਲ"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "ਗੱਲਬਾਤ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "ਅਣਜਾਣ ਜਾਂ ਗਲਤ ਪਛਾਣ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "ਸੰਪਰਕ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "ਸੰਪਰਕ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਜਾ ਸਕੀ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "ਪਾਬੰਦੀ ਲਗਾ� ਸੰਪਰਕ ਸੋਧੋ"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "ਅਕਾਊਂਟ:"
 
@@ -1665,464 +1677,381 @@ msgstr "ਪਾਬੰਦੀਸ਼�ਦਾ ਸੰਪਰਕ"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "ਹਟਾਓ"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ਲਿੰਕ �ਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ�ਹੋ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "ਕੀ ਤ�ਸੀਂ '%s' ਨੂੰ ਤ�ਹਾਡੇ ਨਾਲ ਫੇਰ ਸੰਪਰਕ ਕਰਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ਇਹ ਸੰਪਰਕ ਨੂੰ ਅਸ਼ਲੀਲ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ(_R)"
 msgstr[1] "ਇਹਨਾਂ ਸੰਪਰਕਾਂ ਨੂੰ ਅਸ਼ਲੀਲ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "ਮੈਂਬਰੀ ਮੰਗ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ਯੂਜ਼ਰ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "ਬਿਨ-ਗਰ�ੱਪ"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "ਕੀ ਤ�ਸੀਂ ਗਰ�ੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "ਗਰ�ੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "ਕੀ ਤ�ਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "ਗੱਲਬਾਤ(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "ਆਡੀਓ ਕਾਲ(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "ਫਾਇਲ ਭੇਜੋ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "ਪਸੰਦ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "ਜਾਣਕਾਰੀ(_m)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "ਇਸ ਰੂਮ ਲਈ ਤ�ਹਾਨੂੰ ਸੱਦਾ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ਸੰਪਰਕ ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "ਖੋਜ: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "ਤ�ਹਾਡੀ ਜਾਣ-ਪਛਾਣ ਕਰਵਾਉਣ ਵਾਲਾ ਸ�ਨੇਹਾ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "ਤ�ਹਾਨੂੰ ਆਨਲਾਈਨ ਹੋਣ ਦਿਉ ਜੀ। ਧੰਨਵਾਦ!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ਸੰਪਰਕ ਚ�ਣੋ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ਪੂਰਾ ਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ਫੋਨ ਨੰਬਰ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ਈਮੇਲ �ਡਰੈੱਸ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ਵੈੱਬਸਾਈਟ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "ਜਨਮਦਿਨ:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ ਇਸ ਨਾਲ:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "ਦੂਰਾ ਸ�ਨੇਹਾ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ਚੈਨਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ਦੇਸ਼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ਹਾਲਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "ਸ਼ਹਿਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "�ਰੀਆ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ਡਾਕ ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "ਗਲੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ਇਮਾਰਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "ਮੰਜ਼ਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ਘਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "ਟੈਕਸਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "ਸ਼�ੱਧਤਾ ਲੈਵਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ਗਲਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "ਬੀਰਿੰਗ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "ਚੜ�ਹਨ ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "ਲੰਬਕਾਰੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "ਵਿਥਕਾਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "ਉਚਾਈ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%R UTC %e %B %Y ਨੂੰ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "ਉਪ-ਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "ਕਲਾਇਟ:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "ਨਿੱਜੀ ਵੇਰਵਾ"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "ਪੂਰਾ ਨਾਂ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "ਫੋਨ ਨੰਬਰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "ਈਮੇਲ �ਡਰੈੱਸ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "ਵੈੱਬਸਾਈਟ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "ਜਨਮਦਿਨ"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ/ਵੇਖੀ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ ਇਸ ਨਾਲ"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "ਦੂਰ ਸ�ਨੇਹਾ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "ਕੰਮ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "ਘਰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "ਮੋਬਾਈਲ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "ਡਾਕ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "ਪਾਰਸਲ"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "ਪਛਾਣਕਰਤਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "ਉਪ-ਨਾਂ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "ਜਾਣਕਾਰੀ ਮੰਗੀ ਗਈ…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "ਵਰਜਨ:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "ਕਲਾਇਟ:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "ਗਰ�ੱਪ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2131,105 +2060,168 @@ msgstr ""
 "ਇੱਕ ਤੋਂ ਵੱਧ ਗਰ�ੱਪ ਜਾਂ ਕੋਈ "
 "ਗਰ�ੱਪ ਨਹੀਂ ਵੀ ਚ�ਣ ਸਕਦੇ ਹੋ।"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "ਗਰ�ੱਪ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "ਗਰ�ੱਪ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਪਛਾਣਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲੱਗ ਸਕਦੀ:"
 msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਪਛਾਣਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲੱਗ ਸਕਦੀ:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "ਲਿੰਕ ਕਰਨ ਲਈ ਸੰਪਰਕ ਚ�ਣੋ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "ਨਵਾਂ ਸੰਪਰਕ �ਲਕ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚ�ਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇੱਕਠੇ ਜੋੜਿਆ ਜਾਵੇਗਾ।"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "ਕਾਲ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਅਕਾਊਂਟ ਚ�ਣੋ"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "ਕਾਲ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "ਮੋਬਾਈਲ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "ਕੰਮ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ਘਰ"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "ਗੱਲਬਾਤ(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ਫਾਇਲ ਭੇਜੋ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "ਸੰਪਰਕ ਵੇਰਵੇ ਨੂੰ ਵਰਤਣ ਲਈ gnome-contacts ਇੰਸਟਾਲ ਕਰੋ।"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "ਜਾਣਕਾਰੀ(_m)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "ਇਸ ਰੂਮ ਲਈ ਤ�ਹਾਨੂੰ ਸੱਦਾ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "ਹਟਾਓ ਅਤੇ ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "ਕੀ ਤ�ਸੀਂ ਗਰ�ੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "ਗਰ�ੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "ਕੀ ਤ�ਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2239,7 +2231,11 @@ msgstr ""
 "ਸੰਪਰਕ ਹਟਾ� "
 "ਜਾਣਗੇ, ਜੋ ਕਿ ਇਸ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਨੂੰ ਬਣਾਉਂਦੇ ਹਨ।"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2250,23 +2246,23 @@ msgstr[1] "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱà¨
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "ਫੋਨ ਜਾਂ ਮੋਬਾਇਲ ਜੰਤਰ ਤੋਂ ਆਨਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC ਨੈੱਟਵਰਕ ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "ਨੈੱਟਵਰਕ ਲਿਸਟ ਮ�ੜ-ਸੈੱਟ ਕਰੋ(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "ਚ�ਣੋ"
@@ -2279,257 +2275,262 @@ msgstr "ਨਵਾਂ ਸਰਵਰ"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"ਵੇਖਾ� ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ�ਹਾਂ ਵੰਡ ਦਿਉ।"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ਲਿੰਕ ਕਰੋ(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ '%s' ਲਈ ਲਿੰਕ ਹਟਾਉਣਾ?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"ਕੀ ਤ�ਸੀਂ ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ? ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ "
-"ਵੱਖ ਵੱਖ ਸੰਪਰਕਾਂ 'ਚ "
-"ਵੰਡ ਦੇਵੇਗਾ।"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ਅਣ-ਲਿੰਕ ਕਰੋ(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "ਅਤੀਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "ਵੇਖਾਓ"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s ਨਾਲ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
-#| msgid "%d second ago"
-#| msgid_plural "%d seconds ago"
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ਸਕਿੰਟ"
 msgstr[1] "%s ਸਕਿੰਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s ਮਿੰਟ"
 msgstr[1] "%s ਮਿੰਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਲਈ, %s ਵਜੇ ਖਤਮ ਹੋਈ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "ਕੱਲ�ਹ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
-#| msgctxt ""
-#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
-#| msgid "%e %B %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "ਕਿਸੇ ਵੀ ਸਮੇਂ"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "ਕੋਈ ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "ਕੌਣ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "ਕਦੋਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "ਕ�� ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "ਟੈਕਸਟ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "ਆਉਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "ਜਾਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "ਖ�ੰ�ੀਆਂ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "ਕੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਪਿਛਲੀਆਂ ਗੱਲਾਬਾਤਾਂ ਤੋਂ ਸਭ ਲਾਗ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "ਸਭ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "ਇਸ ਤੋਂ ਹਟਾਓ:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...</span>"
+msgid "_File"
+msgstr "ਫਾਇਲ(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "ਗੱਲਬਾਤ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "ਸੋਧ(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "ਸਭ ਅਤੀਤ ਹਟਾਓ..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "ਪਰੋਫਾਇਲ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "ਵਿਡੀਓ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "ਗੱਲਬਾਤ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "ਵਿਡੀਓ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "ਫਾਇਲ(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "ਸਫ਼ਾ 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ਸੰਪਰਕ ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "ਗੱਲਬਾਤ(_h)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਜਾਂ ਤਾਂ ਗਲਤ ਹੈ ਜਾਂ ਅਣਜਾਣ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "ਸੰਪਰਕ ਇਹ ਕਿਸਮ ਦੀ ਸੰਵਾਦ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "ਦਿੱਤੇ ਸੰਪਰਕ ਨਾਲ ਗੱਲਬਾਤ ਸ਼�ਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "ਤ�ਹਾਡੇ ਉੱਤੇ ਇਹ ਚੈਨਲ ਤੋਂ ਪਾਬੰਦੀ ਲਗਾਈ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "ਇਹ ਚੈਨਲ ਭਰਿਆ ਹੋਇਆ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "ਤ�ਹਾਨੂੰ ਇਹ ਚੈਨਲ ਨੂੰ ਜ�ਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਚਾਹੀਦਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "ਡਿਸ-ਕ�ਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਅੱਗੇ ਨਹੀਂ ਜਾਇਆ ਜਾ ਸਕਦਾ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "ਗੱਲਬਾਤ ਸ਼�ਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "ਸੰਪਰਕ ਪਛਾਣ ਜਾਂ ਫੋਨ ਨੰਬਰ ਦਿਉ।"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "ਕਾਲ(_a)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "ਨਵੀਂ ਕਾਲ"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> ਅਕਾਊਂਟ ਲਈ ਪਰਮਾਣਕਿਤਾ ਫੇਲ�ਹ ਹੈ"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2566,12 +2567,8 @@ msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲà
 msgid "Set status"
 msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "ਪਸੰਦੀਦਾ ਸ�ਨੇਹੇ..."
 
@@ -2579,7 +2576,7 @@ msgstr "ਪਸੰਦੀਦਾ ਸ�ਨੇਹੇ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
@@ -2589,20 +2586,20 @@ msgid "Find:"
 msgstr "ਲੱਭੋ:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "ਮਿਲਦੇ ਕੇਸ(_c)"
+msgid "_Previous"
+msgstr "ਪਿੱਛੇ(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦੇ ਕੇਸ(_c)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "ਪਿੱਛੇ(_P)"
+msgid "Phrase not found"
+msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2648,12 +2645,12 @@ msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
 msgid "Edit Custom Messages"
 msgstr "ਪਸੰਦੀਦਾ ਸ�ਨੇਹੇ ਸੋਧੋ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "%s ਉੱਤੇ ਸ�ਨੇਹਾ ਸੋਧਿਆ ਗਿਆ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
@@ -2729,34 +2726,40 @@ msgid "Certificate hostname: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "ਜਾਰੀ ਰੱਖੋ"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "ਜਾਰੀ ਰੱਖੋ(_o)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+#| msgid "User requested disconnect"
+msgid "Untrusted connection"
+msgstr "ਬੇਭਰੋਸੇਯੋਗ ਕ�ਨੈਕਸ਼ਨ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "ਇਹ ਕ�ਨੈਕਸ਼ਨ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ। ਕੀ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "ਭਵਿੱਖ ਦੇ ਕ�ਨੈਕਸ਼ਨਾਂ ਲਈ ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਰਵਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI ਖੋਲ�ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2766,7 +2769,7 @@ msgstr ""
 "ਟਿਕਾਣਾ ਚ�ਣੋ "
 "ਜੀ।"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ"
@@ -2938,39 +2941,31 @@ msgstr "ਦੱਖਣੀ"
 msgid "Vietnamese"
 msgstr "ਵੀਅਤਨਾਮੀ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "ਚ�ਣਿਆ ਸੰਪਰਕ ਫਾਇਲਾਂ ਨਹੀਂ ਲੈ ਸਕਦਾ ਹੈ।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "ਚ�ਣਿਆ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "ਕੋਈ ਗਲਤੀ ਸ�ਨੇਹਾ ਨਹੀਂ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "ਤ�ਰੰਤ ਸ�ਨੇਹਾ (ਇੰਪੈਥੀ)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਕ�ਨੈਕਟ ਨਾ ਕਰੋ"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕੋਈ ਹੋਰ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- ਇੰਪੈਥੀ ਤ�ਰੰਤ ਸ�ਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3020,238 +3015,89 @@ msgstr ""
 "੦੨੧੧੦-੧੩੦੧੫੯, "
 "ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "ਗਨੋਮ ਲਈ ਤ�ਰੰਤ ਸ�ਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009, 2010\n"
 "http://www.satluj.com/"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "ਅਕਾਊਂਟ ਵੇਰਵਾ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "ਗਲਤੀ ਸ�ਨੇਹਾ ਸੀ: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"ਤ�ਸੀਂ ਜਾ ਕੇ ਆਪਣੇ ਅਕਾਊਂਟ ਵੇਰਵੇ ਵਿੱਚ ਆਪਣੇ ਵੇਰਵਾ ਲਈ ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ "
-"ਇਹ ਸਹਾਇਕ ਬੰਦ ਕਰਕੇ "
-"ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "ਗਲਤੀ ਆਈ"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "ਤ�ਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤ�ਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤ�ਸੀਂ ਬਣਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "ਕੀ ਤ�ਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"ਇੰਪੈਥੀ ਨਾਲ ਤ�ਸੀਂ ਨੇੜਲੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਤੇ ਦੋਸਤਾਂ, ਮਿੱਤਰਾਂ, ਸਾਥੀਆਂ, ਜੋ ਕਿ ਗੂਗਲ "
-"ਟਾਕ, AIM, ਵਿੰਡੋਜ਼ "
-"ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ "
-"ਤ�ਸੀਂ ਆਡੀਓ ਅਤੇ "
-"ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤ�ਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹ�ਣ ਦੇਵਾਂਗਾ"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹ�ੰਦਾ ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹ�ਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹ�ੰਦਾ ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ਅਕਾਊਂਟ ਚ�ਣੋ, ਜੋ ਤ�ਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹ�ੰਦੇ ਹੋ:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "ਨਹੀਂ, ਹ�ਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"ਇੰਪੈਥੀ ਤ�ਹਾਡੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਮੌਜੂਦ ਕ�ਨੈਕਟ ਹੋ� ਲੋਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੱਭ ਅਤੇ ਗੱਲਬਾਤ "
-"ਕਰਵਾ ਸਕਦਾ ਹੈ। ਜੇ ਤ�ਸੀਂ "
-"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹ�ੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ। ਤ�ਸੀਂ "
-"ਇਹ ਵੇਰਵਾ ਬਾਅਦ "
-"ਵਿੱਚ ਵੀ ਸੌਖੀ ਤਰ�ਹਾਂ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ 'ਅਕਾਊਂਟ' ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਫੀਚਰ ਬੰਦ "
-"ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹਾਲੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹ�ੰਦਾ(_n)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"ਤ�ਸੀਂ ਆਪਣੇ ਲੋਕਲ ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੌਜੂਦ ਲੋਕਾਂ ਨਾਲ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ, ਕਿਉਂਕਿ, "
-"telepathy-salut "
-"ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤ�ਸੀਂ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ ਤਾਂ telepathy-salut "
-"ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ "
-"ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ਤ�ਹਾਡੇ ਅਕਾਊਂਟ %s ਨਾਲ ਸਬੰਧਿਤ ਕ�� ਨਾ-ਸੰਭਾਲੀਆਂ ਸੋਧਾਂ ਹਨ।"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "ਤ�ਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "ਆਫਲਾਈਨ — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਖਤਮ  — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "ਆਫਲਾਈਨ — ਕੋਈ ਨੈੱਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "ਅਣਜਾਣ ਹਾਲਤ"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "ਆਫਲਾਈਨ — ਅਕਾਊਂਟ ਆਯੋਗ ਹੈ"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"ਤ�ਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤ�ਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
-"ਕੀ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "ਕ�ਨੈਕਸ਼ਨ ਪੈਰਾਮੀਟਰ ਸੋਧ"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "ਸਰਵਰ ਤੋਂ ਤ�ਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਲੈਣ ਲਈ ਫੇਲ�ਹ ਹੈ।"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸੋਧਣ ਲਈ ਆਨਲਾਈਨ ਜਾਉ।"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "ਕ�ਨੈਕਸ਼ਨ ਪੈਰਾਮੀਟਰ ਸੋਧ(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੋਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਤ�ਹਾਡਾ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾ�ਗਾ।"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3260,15 +3106,24 @@ msgstr ""
 "ਕੀ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "ਯੋਗ(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "ਆਯੋਗ(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "ਛੱਡੋ(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "ਕ�ਨੈਕਸ਼ਨ ਕਰੋ(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3280,19 +3135,15 @@ msgstr ""
 msgid "Add…"
 msgstr "…ਸ਼ਾਮਲ"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ"
+msgid "_Import…"
+msgstr "ਇੰਪੋਰਟ(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "ਪਰੋਟੋਕਾਲ:"
+msgid "Loading account information"
+msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3301,446 +3152,298 @@ msgstr ""
 "ਹੋ, ਲਈ ਬੈਕ�ਂਡ ਇੰਸਟਾਲ "
 "ਕਰਨੀ ਪਵੇਗੀ।"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "ਇੰਪੋਰਟ(_I)…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਬੈਕ�ਂਡ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "ਨੇੜਲੇ ਲੋਕ"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
-msgid "- Empathy Audio/Video Client"
-msgstr "- ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
-msgid "Empathy Audio/Video Client"
-msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
-
-#: ../src/empathy-streamed-media-window.c:431
-msgid "Contrast"
-msgstr "ਕਨਟਰਾਸਟ"
-
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Brightness"
-msgstr "ਚਮਕ"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Gamma"
-msgstr "ਗਾਮਾ"
-
-#: ../src/empathy-streamed-media-window.c:542
-msgid "Volume"
-msgstr "ਆਵਾਜ਼"
-
-#: ../src/empathy-streamed-media-window.c:1110
-msgid "_Sidebar"
-msgstr "ਬਾਹੀ(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1130
-msgid "Audio input"
-msgstr "ਆਡੀਓ ਆਉਟਪ�ੱਟ"
-
-#: ../src/empathy-streamed-media-window.c:1134
-msgid "Video input"
-msgstr "ਵਿਡੀਓ ਆਉਟਪ�ੱਟ"
-
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Dialpad"
-msgstr "ਡਾਇਲ-ਪੈਡ"
-
-#: ../src/empathy-streamed-media-window.c:1151
-msgid "Details"
-msgstr "ਵੇਰਵਾ"
-
-#. translators: Call is a noun and %s is the contact name. This string
-#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
-#, c-format
-msgid "Call with %s"
-msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
-msgid "The IP address as seen by the machine"
-msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP �ਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
-msgid "The IP address as seen by a server on the Internet"
-msgstr "IP �ਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
-msgid "The IP address of the peer as seen by the other side"
-msgstr "ਪੀਅਰ ਦਾ IP �ਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
-msgid "The IP address of a relay server"
-msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP �ਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
-msgid "The IP address of the multicast group"
-msgstr "ਮਲਟੀਕਾਸਟ ਗਰ�ੱਪ ਦਾ IP �ਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "ਕ�ਨੈਕਟ ਹੈ -- %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
-msgid "Technical Details"
-msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮ� ਨਹੀਂ "
-"ਸਕਦਾ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮ� ਨਹੀਂ "
-"ਸਕਦਾ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"%s ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤ�ਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, "
-"ਜੋ ਸਿੱਧਾ ਕ�ਨੈਕਸ਼ਨ "
-"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
-msgid "There was a failure on the network"
-msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕ�� ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ "
-"ਅਤੇ ਮੱਦਦ "
-"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
-
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
-msgid "There was a failure in the call engine"
-msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
-msgid "The end of the stream was reached"
-msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
-msgid "Can't establish audio stream"
-msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
-msgid "Can't establish video stream"
-msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "ਆਡੀਓ"
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "ਕਾਲ ਕਰੋ(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "ਡੀਕੋਡਿੰਗ Codec:"
+msgid "_Microphone"
+msgstr "ਮਾਈਕਰੋਫੋਨ(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
+msgid "_Camera"
+msgstr "ਕੈਮਰਾ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "ਡਾਇਲਪੈਡ ਵੇਖਾਓ"
+msgid "_Settings"
+msgstr "ਸੈਟਿੰਗ(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ਇੰਕੋਡਿੰਗ Codec:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "ਮੱਦਦ(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ਮੌਜੂਦਾ ਕਾਲ ਬੰਦ ਕਰੋ"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "ਸਮੱਗਰੀ(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ਲੋਕਲ ਉਮੀਦਵਾਰ:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "ਡੀਬੱਗ(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "ਮੈਨੂੰ ਵੱਧੋ-ਵੱਧ ਕਰੋ"
+msgid "Swap camera"
+msgstr "ਕੈਮਰਾ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "ਮੈਨੂੰ ਘੱਟੋ-ਘੱਟ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "ਰਿਮੋਟ ਉਮੀਦਵਾਰ:"
+msgid "Maximise me"
+msgstr "ਮੈਨੂੰ ਵੱਧੋ-ਵੱਧ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "ਆਡੀਓ ਭੇਜੋ"
+msgid "Disable camera"
+msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "ਵਿਡੀਓ ਭੇਜੋ"
+msgid "Hang up"
+msgstr "ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "ਡਾਇਲ-ਪੈਡ ਵੇਖੋ"
+msgid "Hang up current call"
+msgstr "ਮੌਜੂਦਾ ਕਾਲ ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "ਵਿਡੀਓ ਕਾਲ"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "ਵਿਡੀਓ ਕਾਲ ਸ਼�ਰੂ ਕਰੋ"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "ਆਡੀਓ ਕਾਲ ਸ਼�ਰੂ ਕਰੋ"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "ਕੈਮਰਾ ਬਦਲੋ"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "ਵਿਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
+msgid "Show dialpad"
+msgstr "ਡਾਇਲ-ਪੈਡ ਵੇਖੋ"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
+msgid "Display the dialpad"
+msgstr "ਡਾਇਲਪੈਡ ਵੇਖਾਓ"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "ਵਿਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "ਵਿਡੀਓ ਕਾਲ"
+msgid "Toggle video transmission"
+msgstr "ਵਿਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "ਕਾਲ ਕਰੋ(_C)"
+msgid "Send Audio"
+msgstr "ਆਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "ਕੈਮਰਾ(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "ਸਮੱਗਰੀ(_C)"
+msgid "Toggle audio transmission"
+msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "ਡੀਬੱਗ(_D)"
+msgid "Encoding Codec:"
+msgstr "ਇੰਕੋਡਿੰਗ Codec:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ਮੱਦਦ(_H)"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2540
+#: ../src/empathy-call-window.c:2541 ../src/empathy-call-window.c:2542
+#: ../src/empathy-call-window.c:2543
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "ਡੀਕੋਡਿੰਗ Codec:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "ਮਾਈਕਰੋਫੋਨ(_M)"
+msgid "Remote Candidate:"
+msgstr "ਰਿਮੋਟ ਉਮੀਦਵਾਰ:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "ਸੈਟਿੰਗ(_S)"
+msgid "Local Candidate:"
+msgstr "ਲੋਕਲ ਉਮੀਦਵਾਰ:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "ਵੇਖੋ(_V)"
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "ਆਡੀਓ"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨੀ?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ %s ਛੱਡੇ ਜਾਣਗੇ। ਤ�ਸੀਂ ਮ�ੜ-ਜ�ਆਇੰਨ ਹੋਣ ਤੱਕ ਸ�ਨੇਹੇ ਪ�ਰਾਪਤ "
+"ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਗੱਲਬਾਤ ਰੂਮ ਬੰਦ ਹੋ ਜਾਵੇਗਾ। ਤ�ਸੀਂ ਮ�ੜ-ਜ�ਆਇੰਨ ਹੋਣ ਤੱਕ "
+"ਸ�ਨੇਹੇ ਪ�ਰਾਪਤ ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+msgstr[1] ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ %u ਗੱਲਬਾਤ ਰੂਮ ਬੰਦ ਹੋ ਜਾਵੇਗੇ। ਤ�ਸੀਂ ਮ�ੜ-ਜ�ਆਇੰਨ ਹੋਣ ਤੱਕ "
+"ਸ�ਨੇਹੇ ਪ�ਰਾਪਤ ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "%s ਛੱਡਣਾ ਹੈ?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"ਤ�ਸੀਂ ਇਹ ਗੱਲਬਾਤ ਰੂਪ ਤੋਂ ਕੋਈ ਵੀ ਸ�ਨੇਹਾ ਪ�ਰਾਪਤ ਨਹੀਂ ਕਰੋਗੇ, ਜਦ ਤੱਕ ਤ�ਸੀਂ "
+"ਮ�ੜ-ਜ�ਆਇੰਨ ਨਹੀਂ ਕਰਦੇ ਹੋ।"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr "ਰੂਮ ਛੱਡੋ"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ਨਾ-ਪੜ�ਹੇ)"
 msgstr[1] "%s (%d ਨਾ-ਪੜ�ਹੇ)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ਅਤੇ %u ਹੋਰ)"
 msgstr[1] "%s (ਅਤੇ %u ਹੋਰ)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ ਸ�ਨੇਹੇ)"
 msgstr[1] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ ਸ�ਨੇਹੇ)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ)"
 msgstr[1] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ਸ�ਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "%d ਸ�ਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "ਸ�ਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "ਸਾਫ਼ ਕਰੋ(_l)"
+msgid "_Conversation"
+msgstr "ਗੱਲਬਾਤ(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ਸੰਪਰਕ(_o)"
+msgid "C_lear"
+msgstr "ਸਾਫ਼ ਕਰੋ(_l)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "ਬੰਦਾ-ਖ�ਸ਼ ਸ਼ਾਮਲ(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ਪਸੰਦੀਦਾ ਗੱਲਬਾਤ-ਰੂਮ(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ(_P)..."
+msgid "Notify for All Messages"
+msgstr "ਸਭ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "ਟੈਬ ਖੱਬੇ ਭੇਜੋ(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "ਟੈਬ ਸੱਜੇ ਭੇਜੋ(_R)"
+msgid "Invite _Participant…"
+msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ(_P)..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ਸਭ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਦਿਓ"
+msgid "C_ontact"
+msgstr "ਸੰਪਰਕ(_o)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "ਗੱਲਬਾਤ(_C)"
+msgid "_Tabs"
+msgstr "ਟੈਬਾਂ(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "ਟੈਬ ਵੱਖ ਕਰੋ(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ਪਸੰਦੀਦਾ ਗੱਲਬਾਤ-ਰੂਮ(_F)"
+msgid "_Previous Tab"
+msgstr "ਪਿਛਲੀ ਟੈਬ(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "ਅਗਲੀ ਟੈਬ(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "ਪਿਛਲੀ ਟੈਬ(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "ਬੰਦ ਕੀਤੀ ਟੈਬ ਵਾਪਸ ਖੋਲ�ਹੋ(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "ਟੈਬ ਖੱਬੇ ਭੇਜੋ(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "ਟੈਬਾਂ(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "ਟੈਬ ਸੱਜੇ ਭੇਜੋ(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "ਬੰਦ ਕੀਤੀ ਟੈਬ ਵਾਪਸ ਖੋਲ�ਹੋ(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "ਟੈਬ ਵੱਖ ਕਰੋ(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3754,101 +3457,100 @@ msgstr "ਰੂਮ"
 msgid "Auto-Connect"
 msgstr "ਆਟੋ-ਕ�ਨੈਕਟ"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "ਆ ਰਹੀ ਵਿਡੀਓ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "ਆ ਰਹੀ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ਤ�ਹਾਨੂੰ ਵਿਡੀਓ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤ�ਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ਤ�ਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤ�ਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "ਰੱਦ ਕਰੋ(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "ਜਵਾਬ ਦਿਓ(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
 msgstr "ਵਿਡੀਓ ਨਾਲ ਜਵਾਬ(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ਤੋਂ ਵਿਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "ਰੂਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ਜ�ਆਇੰਣ ਕਰਨ ਲਈ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ਤ�ਹਾਨੂੰ %s ਜ�ਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "ਇਨਕਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "ਦਾਖਲ(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨੇ ਤ�ਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ਤ�ਹਾਨੂੰ %s ਜ�ਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਆਇਆ ਹੈ"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 "%s ਤ�ਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹ�ੰਦਾ/ਚਾਹ�ੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਤ�ਸੀਂ ਆਨਲਾਈਨ ਹੋਵੋ"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3858,105 +3560,105 @@ msgstr ""
 "ਸ�ਨੇਹਾ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%3$s/s ਨਾਲ %2$s ਵਿੱਚੋਂ %1$s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s ਵਿੱਚੋਂ %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "%2$s ਵਲੋਂ \"%1$s\" ਆ ਰਹੀ ਹੈ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "%2$s ਤੋਂ \"%1$s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ਫਾਇਲ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "%2$s ਤੋਂ \"%1$s\" ਮਿਲੀ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜੀ"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "ਹੋਰ ਦਰਸ਼ਕਾਂ ਦੇ ਜਵਾਬ ਦੀ ਉਡੀਕ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ਦੀ �ਂਟੀਗਰੇਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\" ਹੈਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ਫਾਇਲ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "ਬਾਕੀ"
 
@@ -3968,7 +3670,12 @@ msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "ਲਿਸਟ ਵਿੱਚੋਂ ਪੂਰੇ ਹੋ�, ਰੱਦ ਕੀਤੇ ਅਤੇ ਫੇਲ�ਹ ਹੋ� ਫਾਇਲ ਸੰਚਾਰ ਹਟਾਓ"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "ਇੰਪੋਰਟ(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3977,171 +3684,198 @@ msgstr ""
 "ਕਰਨ ਲਈ ਹੀ "
 "ਸਹਾਇਕ ਹੈ।"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ਇੰਪੋਰਟ"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "ਪਰੋਟੋਕਾਲ"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ਡਿਸ-ਕ�ਨੈਕਸ਼ਨ"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "ਤ�ਹਾਨੂੰ ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ ਇੱਕ ਅਕਾਊਂਟ ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"ਅਫਸੋਸ, %s ਅਕਾਊਂਟ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਜਦੋਂ ਤੱਕ ਤ�ਸੀਂ %s ਸਾਫਟਵੇਅਰ ਨੂੰ ਅੱਪਡੇਟ "
+"ਨਹੀਂ ਕਰਦੇ।"
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "...ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕਰੋ"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "ਮ�ੜ-ਕ�ਨੈਕਟ"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "ਬੰਦ ਕਰੋ"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "ਟਾਪ ਅੱਪ %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "ਅਕਾਊਂਟ ਕਰੈਡਿਟ ਟਾਪਅੱਪ ਕਰੋ"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "ਟਾਪ ਅੱਪ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ ਤ�ਹਾਨੂੰ ਆਪਣੇ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਇੱਕ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਪਵੇਾਗ।"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "ਤ�ਹਾਨੂੰ ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ %s ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "ਅਕਾਊਂਟ ਸੈਟਿੰਗ"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "ਕਰੈਡਿਟ ਬਕਾਇਆ"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "ਨਵੀਂ ਗੱਲਬਾਤ(_N)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "ਨਵੀਂ ਕਾਲ(_C)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚ ਦਾਖਲ(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "ਸੰਪਰਕ ਲੱਭੋ(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ਪਸੰਦ ਪਰਬੰਧ"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "ਸਧਾਰਨ ਆਕਾਰ(_o)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "ਨਵੀਂ ਕਾਲ(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "ਕਰੈਡਿਟ ਬਕਾਇਆ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "ਅਕਾਊਂਟ(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "ਪਾਬੰਦੀਸ਼�ਦਾ ਸੰਪਰਕ(_B)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "ਪਸੰਦ(_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "ਅਕਾਊਂਟ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "ਪਾਬੰਦੀਸ਼�ਦਾ ਸੰਪਰਕ(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "ਸਧਾਰਨ ਆਕਾਰ(_o)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "ਸੰਖੇਪ ਆਕਾਰ(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "ਰੂਮ(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "ਦਾਖਲ(_J)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "ਨਵੀਂ ਗੱਲਬਾਤ..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "ਰੂਮ(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "ਪਸੰਦ ਵਿੱਚ ਦਾਖਲ(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "ਸੰਪਰਕ ਲੱਭੋ(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "ਪਸੰਦ ਪਰਬੰਧ"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ਮੈਂਬਰ"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4154,22 +3888,27 @@ msgstr ""
 "ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %s\n"
 "ਮੈਂਬਰ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ਹਾਂ"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਸ਼�ਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ਰੂਮ ਲਿਸਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4178,6 +3917,10 @@ msgstr ""
 "ਦਾਖਲ ਹੋਣ ਵਾਸਤੇ ਰੂਮ ਨਾਂ ਦਿਓ ਜਾਂ ਲਿਸਟ ਵਿੱਚੋਂ ਇੱਕ ਜਾਂ ਵੱਧ ਰੂਮ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ।"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ਰੂਮ(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4185,503 +3928,954 @@ msgstr ""
 "ਸਰਵਰ ਦਿਓ, ਜਿਸ ਉੱਤੇ ਰੂਮ ਮੌਜੂਦ ਹਨ ਜਾਂ ਖਾਲੀ ਛੱਡੋ, ਜੇ ਰੂਮ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ "
 "ਹੀ ਮੌਜੂਦ ਹਨ।"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ਰੂਮ ਲਿਸਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ਰੂਮ ਲਿਸਟ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ਰੂਮ(_R):"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "ਸ�ਨੇਹਾ ਮਿਲਿਆ"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "ਸ�ਨੇਹਾ ਭੇਜਿਆ"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਇਆ"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "ਅਕਾਊਂਟ ਕ�ਨੈਕਟ ਕੀਤਾ"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "ਅਕਾਊਂਟ ਕ�ਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "ਹੀਰ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ਰਾਂ�ਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ਵੇ ਰਾਂ�ਿਆ, ਰਾਂ�ਿਆ, ਤੂੰ ਕਿੱਥੇ �ਂ ਧੀਦੋ ਰਾਂ�ਿਆਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "ਆਪਣੇ ਤਖਤ ਹਜ਼ਾਰੇ ਨੂੰ ਛੱਡ ਨੂੰ ਤੇਰੀਆਂ ਮੱ�ੀਆਂ ਚਾਰੀਆਂ;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ਜਾਂ ਮੈਨੂੰ ਤੇਰੇ ਪਿਆਰ ਦੀ ਸੌਂਹ ਹੀਰੇ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ਅਤੇ ਮੈਂ ਹ�ਣ ਰਾਂ�ੇ ਬਿਨਾਂ ਨਹੀਂ ਜਿਊਂਣਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ਕੀ ਮੈਂ ਹੋ ਸ�ਣਾਂ ਜਾਂ ਮੈਂ ਇਸ ਬਾਰੇ ਗੱਲ ਕਰਾਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "ਰਾਂ�ਾ ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "ਪਸੰਦ"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "ਖ�ਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "ਦਿੱਖ"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "ਰਵੱਈਆ"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "ਗੱਲਬਾਤ 'ਚ ਸ਼�ਰੂ:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
+msgid "new ta_bs"
+msgstr "ਨਵੀਆਂ ਟੈਬਾਂ(_b)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ�ੱ�ਿਆ/ਰ��ੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
+msgid "new _windows"
+msgstr "ਨਵੀਆਂ ਵਿੰਡੋਜ਼(_w)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ��ਿਆ/ਰ��ੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕ�ਨੈਕਟ ਕਰੋ(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"ਈਕੋ ਰੱਦ ਕਰਨ ਨਾਲ ਦੂਜੇ ਵਿਅਕਤੀ ਨੂੰ ਤ�ਹਾਡੀ ਆਵਾਜ਼ ਸਾਫ਼ ਸ�ਣਨ ਵਿੱਚ ਮੱਦਦ ਮਿਲਦੀ ਹੈ, ਪਰ "
-"ਕ�� ਕੰਪਿਊਟਰਾਂ "
-"ਉੱਤੇ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਜੇ ਤ�ਹਾਨੂੰ ਜਾਂ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਅਜੀਬ ਜਿਹੀਆਂ ਆਵਾਜ਼ ਸ�ਣਨ "
-"ਜਾਂ ਕਾਲ ਦੇ ਦੌਰਾਨ "
-"ਰ�ਕਾਵਟ ਆ� ਤਾਂ ਈਕੋ ਰੱਦ ਕਰਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਕਾਲ ਮ�ੜ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgid "Log conversations"
+msgstr "ਗੱਲਬਾਤ ਲਾਗ"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "Behavior"
+msgstr "ਰਵੱਈਆ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "General"
+msgstr "ਆਮ"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
+msgid "_Enable bubble notifications"
+msgstr "ਬ�ਲਬ�ਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
+msgid "Disable notifications when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ�ੱ�ਿਆ/ਰ��ੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "ਆਮ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "ਇੰਪ�ੱਟ ਲੈਵਲ:"
+msgid "Enable notifications when a contact comes online"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "ਇੰਪ�ੱਟ ਆਵਾਜ਼:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
+msgid "_Enable sound notifications"
+msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "ਗੱਲਬਾਤ ਲਾਗ"
+msgid "Disable sounds when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ��ਿਆ/ਰ��ੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "ਸਾਊਂਡ"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "ਪਰਾਈਵੇਸੀ"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "ਕਾਲ ਕ�ਆਲਟੀ ਸ�ਧਾਰਨ ਲਈ ਗੂੰਜ ਰੱਦਕ ਕਰਨਾ (_echo cancellation) ਵਰਤੋਂ"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"ਟਿਕਾਣਾ ਸ਼�ੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤ�ਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕ�� ਵੀ "
-"ਵੇਖਾਇਆ ਨਹੀਂ "
-"ਜਾਵੇਗਾ। GPS ਧ�ਰਾ ਮ�ੱਲ 1 ਦਸ਼ਮਲਵ ਥਾਂ ਨਾਲ ਸ਼�ੱਧ ਹੋਣਗੇ।"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "ਖ�ਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
+"ਈਕੋ ਰੱਦ ਕਰਨ ਨਾਲ ਦੂਜੇ ਵਿਅਕਤੀ ਨੂੰ ਤ�ਹਾਡੀ ਆਵਾਜ਼ ਸਾਫ਼ ਸ�ਣਨ ਵਿੱਚ ਮੱਦਦ ਮਿਲਦੀ ਹੈ, ਪਰ "
+"ਕ�� ਕੰਪਿਊਟਰਾਂ "
+"ਉੱਤੇ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਜੇ ਤ�ਹਾਨੂੰ ਜਾਂ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਅਜੀਬ ਜਿਹੀਆਂ ਆਵਾਜ਼ ਸ�ਣਨ "
+"ਜਾਂ ਕਾਲ ਦੇ ਦੌਰਾਨ "
+"ਰ�ਕਾਵਟ ਆ� ਤਾਂ ਈਕੋ ਰੱਦ ਕਰਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਕਾਲ ਮ�ੜ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "ਸਾਊਂਡ"
+msgid "_Publish location to my contacts"
+msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ�ਹਾਂ ਲਈ ਤ�ਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
+"ਟਿਕਾਣਾ ਸ਼�ੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤ�ਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕ�� ਵੀ "
+"ਵੇਖਾਇਆ ਨਹੀਂ "
+"ਜਾਵੇਗਾ। GPS ਧ�ਰਾ ਮ�ੱਲ 1 ਦਸ਼ਮਲਵ ਥਾਂ ਨਾਲ ਸ਼�ੱਧ ਹੋਣਗੇ।"
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "ਥੀਮ"
+msgid "_Reduce location accuracy"
+msgstr "ਟਿਕਾਣਾ ਸ਼�ੱਧਤਾ ਘਟਾਓ(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "ਬਦਲ:"
+msgid "Privacy"
+msgstr "ਪਰਾਈਵੇਸੀ"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕ�ਨੈਕਟ ਕਰੋ(_A)"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "ਸੈੱਲਫੋਨ(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "ਬ�ਲਬ�ਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ਨੈੱਟਵਰਕ (IP, Wi-Fi)(_N) "
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ਨੈੱਟਵਰਕ (IP, Wi-Fi)(_N) "
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ�ਹਾਂ ਲਈ ਤ�ਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ(_O)"
+msgid "Enable spell checking for languages:"
+msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
+msgid "Spell Checking"
+msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "ਟਿਕਾਣਾ ਸ਼�ੱਧਤਾ ਘਟਾਓ(_R)"
+msgid "Variant:"
+msgstr "ਬਦਲ:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "ਥੀਮ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "ਬੰਦ ਕਰੋ(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "ਸੰਪਰਕ ਨੂੰ ਫੇਰ ਕਾਲ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "ਕੈਮਰਾ ਚਾਲੂ"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰਕੇ ਵਿਡੀਓ ਭੇਜਣਾ ਰੋਕੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "ਕੈਮਰਾ ਚਾਲੂ ਕਰੋ ਤੇ ਵਿਡੀਓ ਭੇਜੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "ਕੈਮਰਾ ਚਲਾਓ, ਪਰ ਵਿਡੀਓ ਨਾ ਭੇਜੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "�ਲਕ"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "ਰੀ-ਡਾਇਲ"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "ਵਿਡੀਓ(_i)"
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "ਵਿਡੀਓ ਬੰਦ"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "ਵਿਡੀਓ ਚਾਲੂ"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ਵਿਡੀਓ �ਲਕ"
-
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "ਸੰਪਰਕ ਮੈਪ �ਲਕ"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr "Pastebin ਲਿੰਕ"
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr "Pastebin ਜਵਾਬ"
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "ਇੱਕ ਵਾਰ ਚੇਪਣ ਲਈ ਡਾਟਾ ਬਹ�ਤ ਵੱਡਾ ਹੈ। ਲਾਗ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ।"
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "ਡੀਬੱਗ ਵਿੰਡੋ"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr "pastebin ਲਈ ਭੇਜੋ"
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "ਵਿਰਾਮ"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "ਲੈਵਲ "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
 msgstr "ਸ�ਨੇਹਾ"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ਨਾਜ਼�ਕ"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "ਲੈਵਲ"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "ਚ�ਣਿਆ ਕ�ਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸੱਦਣ ਲਈ ਸੰਪਰਕ ਚ�ਣੋ:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ਸੱਦਾ"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ਕੋਈ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ; ਕ�� ਵੀ ਕਰੋ (ਇੰਪੋਰਟ ਆਦਿ) ਅਤੇ ਬੰਦ ਕਰੋ"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ਜੇ ਕੋਈ \"ਨੇੜਲੇ ਲੋਕ\" ਅਕਾਊਂਟ ਹੋਵੇ ਤਾਂ ਕੋਈ ਵੀ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "ਦਿੱਤਾ ਅਕਾਊਂਟ ਸ਼�ਰੂ ਵੇਲੇ ਚ�ਣੋ (ਜਿਵੇਂ gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "ਇੱਕ ਖਾਸ ਸਰਵਿਸ ਵੇਖਾਓ"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- ਇੰਪੈਥੀ ਚੈਟ ਕਲਾਇਟ"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "ਜਵਾਬ"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "ਜਵਾਬ ਦਿਓ"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
 msgstr "ਵਿਡੀਓ ਨਾਲ ਜਵਾਬ"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:239
 msgid "Provide"
 msgstr "ਦਿਉ"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ਨੇ ਤ�ਹਾਨੂੰ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਹੈ, ਪਰ ਤ�ਸੀਂ ਹੋਰ ਕਾਲ ਉੱਤੇ ਸੀ।"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP �ਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "IP �ਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "ਪੀਅਰ ਦਾ IP �ਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP �ਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "ਮਲਟੀਕਾਸਟ ਗਰ�ੱਪ ਦਾ IP �ਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2886
 msgid "On hold"
 msgstr "ਹੋਲਡ ਹੈ"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2889
 msgid "Mute"
 msgstr "ਚ�ੱਪ"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2891
 msgid "Duration"
 msgstr "ਅੰਤਰਾਲ"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2894
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:2990
+msgid "Technical Details"
+msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
+
+#: ../src/empathy-call-window.c:3029
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮ� ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3034
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮ� ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3040
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"%s ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤ�ਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, "
+"ਜੋ ਸਿੱਧਾ ਕ�ਨੈਕਸ਼ਨ "
+"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3046
+msgid "There was a failure on the network"
+msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
+
+#: ../src/empathy-call-window.c:3053
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
+
+#: ../src/empathy-call-window.c:3065
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕ�� ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ "
+"ਅਤੇ ਮੱਦਦ "
+"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
+
+#: ../src/empathy-call-window.c:3074
+msgid "There was a failure in the call engine"
+msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
+
+#: ../src/empathy-call-window.c:3077
+msgid "The end of the stream was reached"
+msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
+
+#: ../src/empathy-call-window.c:3117
+msgid "Can't establish audio stream"
+msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: ../src/empathy-call-window.c:3127
+msgid "Can't establish video stream"
+msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: ../src/empathy-call-window.c:3164
+#, c-format
+msgid "Your current balance is %s."
+msgstr "ਤ�ਹਾਡਾ ਮੌਜੂਦਾ ਬਕਾਇਆ %s ਹੈ।"
+
+#: ../src/empathy-call-window.c:3168
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "ਅਫਸੋਸ, ਤ�ਹਾਡੇ ਕੋਲ ਕਾਲ ਕਰਨ ਲਈ ਪੂਰਾ ਕਰੈਡਿਟ ਨਹੀਂ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3170
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "ਟਾਪ ਅੱਪ"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
+
+#: ../src/empathy-call.c:224
+msgid "Empathy Audio/Video Client"
+msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "ਤ�ਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "ਨੇੜਲੇ ਲੋਕ"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"ਇੰਪੈਥੀ ਤ�ਹਾਡੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਮੌਜੂਦ ਕ�ਨੈਕਟ ਹੋ� ਲੋਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੱਭ ਅਤੇ ਗੱਲਬਾਤ "
+"ਕਰਵਾ ਸਕਦਾ ਹੈ। ਜੇ ਤ�ਸੀਂ "
+"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹ�ੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"ਤ�ਸੀਂ ਇਹ ਵੇਰਵਾ ਬਾਅਦ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ ਫੀਚਰ ਨੂੰ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ<span "
+"style=\"italic\">ਸੋਧ "
+"→ਅਕਾਊਂਟ</span> ਦੀ ਚੋਣ ਕਰਕੇ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Call volume"
+#~ msgstr "ਕਾਲ ਆਵਾਜ਼"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "ਕਾਲ ਆਵਾਜ਼, ਫੀਸਦੀ ਵਜੋਂ।"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚ�ੱਕਿਆ ਹੈ।"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "ਅਕਾਊਂਟ %s ਨੂੰ %s ਰਾਹੀਂ ਸੋਧਿਆ ਗਿਆ ਹੈ।"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s ਬਦਲੋ"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "ਰੱਦ ਕਰੋ(_n)"
+
+#~ msgid "Personal Information"
+#~ msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "Ungrouped"
+#~ msgstr "ਬਿਨ-ਗਰ�ੱਪ"
+
+#~ msgid "Favorite People"
+#~ msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "ਸੋਧ(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ਸੰਪਰਕ ਚ�ਣੋ"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "ਲਿੰਕ ਕਰਨ ਲਈ ਸੰਪਰਕ ਚ�ਣੋ"
+
+#~ msgid "New contact preview"
+#~ msgstr "ਨਵਾਂ ਸੰਪਰਕ �ਲਕ"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚ�ਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇੱਕਠੇ ਜੋੜਿਆ ਜਾਵੇਗਾ।"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "ਵੇਖਾ� ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ�ਹਾਂ ਵੰਡ ਦਿਉ।"
+
+#~ msgid "_Link"
+#~ msgstr "ਲਿੰਕ ਕਰੋ(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ '%s' ਲਈ ਲਿੰਕ ਹਟਾਉਣਾ?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ਕੀ ਤ�ਸੀਂ ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ? ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੱਖ ਵੱਖ ਸੰਪਰਕਾਂ "
+#~ "'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ਅਣ-ਲਿੰਕ ਕਰੋ(_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ਸੰਪਰਕ ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "ਗੱਲਬਾਤ(_h)"
+
+#~ msgid "Send _Video"
+#~ msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "ਕਾਲ(_a)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "ਚ�ਣਿਆ ਸੰਪਰਕ ਫਾਇਲਾਂ ਨਹੀਂ ਲੈ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "ਚ�ਣਿਆ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ।"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "ਅਕਾਊਂਟ ਵੇਰਵਾ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error."
+#~ msgstr "ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "ਗਲਤੀ ਸ�ਨੇਹਾ ਸੀ: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "ਤ�ਸੀਂ ਜਾ ਕੇ ਆਪਣੇ ਅਕਾਊਂਟ ਵੇਰਵੇ ਵਿੱਚ ਆਪਣੇ ਵੇਰਵਾ ਲਈ ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ ਸਹਾਇਕ ਬੰਦ "
+#~ "ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "An error occurred"
+#~ msgstr "ਗਲਤੀ ਆਈ"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤ�ਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤ�ਸੀਂ ਬਣਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "ਕੀ ਤ�ਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "ਇੰਪੈਥੀ ਨਾਲ ਤ�ਸੀਂ ਨੇੜਲੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਤੇ ਦੋਸਤਾਂ, ਮਿੱਤਰਾਂ, ਸਾਥੀਆਂ, ਜੋ ਕਿ ਗੂਗਲ ਟਾਕ, AIM, ਵਿੰਡੋਜ਼ "
+#~ "ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ ਤ�ਸੀਂ ਆਡੀਓ ਅਤੇ "
+#~ "ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤ�ਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹ�ਣ ਦੇਵਾਂਗਾ"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹ�ੰਦਾ ਹਾਂ"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹ�ਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹ�ੰਦਾ ਹਾਂ"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ਅਕਾਊਂਟ ਚ�ਣੋ, ਜੋ ਤ�ਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹ�ੰਦੇ ਹੋ:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ਨਹੀਂ, ਹ�ਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹਾਲੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹ�ੰਦਾ(_n)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ਤ�ਸੀਂ ਆਪਣੇ ਲੋਕਲ ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੌਜੂਦ ਲੋਕਾਂ ਨਾਲ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ, ਕਿਉਂਕਿ, telepathy-salut "
+#~ "ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤ�ਸੀਂ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ ਤਾਂ telepathy-salut ਪੈਕੇਜ ਇੰਸਟਾਲ "
+#~ "ਕਰੋ ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "ਤ�ਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤ�ਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
+#~ "ਕੀ ਤ�ਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
+
+#~ msgid "Protocol:"
+#~ msgstr "ਪਰੋਟੋਕਾਲ:"
+
+#~ msgid "Contrast"
+#~ msgstr "ਕਨਟਰਾਸਟ"
+
+#~ msgid "Brightness"
+#~ msgstr "ਚਮਕ"
+
+#~ msgid "Gamma"
+#~ msgstr "ਗਾਮਾ"
+
+#~ msgid "Volume"
+#~ msgstr "ਆਵਾਜ਼"
+
+#~ msgid "_Sidebar"
+#~ msgstr "ਬਾਹੀ(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ਆਡੀਓ ਆਉਟਪ�ੱਟ"
+
+#~ msgid "Video input"
+#~ msgstr "ਵਿਡੀਓ ਆਉਟਪ�ੱਟ"
+
+#~ msgid "Dialpad"
+#~ msgstr "ਡਾਇਲ-ਪੈਡ"
+
+#~ msgid "Details"
+#~ msgstr "ਵੇਰਵਾ"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "ਕ�ਨੈਕਟ ਹੈ -- %d:%02dm"
+
+#~ msgid "_Personal Information"
+#~ msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
+
+#~ msgid "Input level:"
+#~ msgstr "ਇੰਪ�ੱਟ ਲੈਵਲ:"
+
+#~ msgid "Input volume:"
+#~ msgstr "ਇੰਪ�ੱਟ ਆਵਾਜ਼:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ(_O)"
+
+#~ msgid "Call the contact again"
+#~ msgstr "ਸੰਪਰਕ ਨੂੰ ਫੇਰ ਕਾਲ ਕਰੋ"
+
+#~ msgid "Camera Off"
+#~ msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
+
+#~ msgid "Camera On"
+#~ msgstr "ਕੈਮਰਾ ਚਾਲੂ"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰਕੇ ਵਿਡੀਓ ਭੇਜਣਾ ਰੋਕੋ"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "ਕੈਮਰਾ ਚਾਲੂ ਕਰੋ ਤੇ ਵਿਡੀਓ ਭੇਜੋ"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "ਕੈਮਰਾ ਚਲਾਓ, ਪਰ ਵਿਡੀਓ ਨਾ ਭੇਜੋ"
+
+#~ msgid "Preview"
+#~ msgstr "�ਲਕ"
+
+#~ msgid "Redial"
+#~ msgstr "ਰੀ-ਡਾਇਲ"
+
+#~ msgid "V_ideo"
+#~ msgstr "ਵਿਡੀਓ(_i)"
+
+#~ msgid "Video Off"
+#~ msgstr "ਵਿਡੀਓ ਬੰਦ"
+
+#~ msgid "Video On"
+#~ msgstr "ਵਿਡੀਓ ਚਾਲੂ"
+
+#~ msgid "Video Preview"
+#~ msgstr "ਵਿਡੀਓ �ਲਕ"
+
 #~ msgid "Find Next"
 #~ msgstr "ਅੱਗੇ ਲੱਭੋ"
 
@@ -4842,10 +5036,6 @@ msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 #~ msgid "Hidden"
 #~ msgstr "ਓਹਲੇ"
 
-#~| msgid "%s has disconnected"
-#~ msgid "User requested disconnect"
-#~ msgstr "ਯੂਜ਼ਰ ਨੇ ਡਿਸ-ਕ�ਨੈਕਟ ਹੋਣ ਦੀ ਮੰਗ ਕੀਤੀ"
-
 #~ msgid "Show the accounts dialog"
 #~ msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
 
diff --git a/po/pl.po b/po/pl.po
index 43a68a881..cb6755d7a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:52+0200\n"
-"PO-Revision-Date: 2011-10-14 19:53+0200\n"
+"POT-Creation-Date: 2012-03-13 15:36+0100\n"
+"PO-Revision-Date: 2012-03-13 13:37+0100\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -22,518 +22,573 @@ msgstr ""
 "X-Poedit-Country: Poland\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Komunikator"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Komunikator Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Komunikator"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Konta komunikatora i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ZarzÄ…dzanie kontami komunikatora i VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
+msgid "Connection managers should be used"
+msgstr "Użycie menedżerów połączeń"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Głośność rozmowy"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Określa, czy menedżery łączności powinny być używane do automatycznego "
+"rozłączenia/ponownego połączenia."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Głośność rozmowy w procentach."
+msgid "Empathy should auto-connect on startup"
+msgstr "Automatyczne Å‚Ä…czenie siÄ™ podczas uruchamiania"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "UrzÄ…dzenie kamery"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Pozycja kamery"
+msgid "Empathy should auto-away when idle"
+msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
-"podczas rozmowy grupowej."
+"Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
+"bezczynności."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Motyw okna rozmowy"
+msgid "Empathy default download folder"
+msgstr "Domyślny katalog pobierania programu Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Wariant motywu okna rozmowy"
+msgid "The default folder to save file transfers in."
+msgstr "Domyślny katalog zapisu przesyłanych plików."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
-"\")."
+"Magiczny numer używany do sprawdzania, czy należy wykonać zadania czyszczenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Zmniejszona lista kontaktów"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"Kod w empathy-sanity-cleaning.c używa tego numeru do sprawdzania, czy należy "
+"wykonać zadania czyszczenia. Użytkownicy nie powinni ręcznie zmieniać tego "
+"klucza."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Użycie menedżerów połączeń"
+msgid "Show offline contacts"
+msgstr "Wyświetlanie kontaktów w trybie offline"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kryterium porządkowania listy kontaktów"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Domyślne urządzenie kamery do użycia w wideorozmowach, np. /dev/video0."
+msgid "Show avatars"
+msgstr "Wyświetlanie awatarów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Domyślny katalog, z którego są wybierane awatary"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
+msgid "Show protocols"
+msgstr "Wyświetlanie protokołów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Wyłączenie dźwięków podczas nieobecności"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
+msgid "Show Balance in contact list"
+msgstr "Wyświetlanie salda na liście kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
-"będą natychmiast prezentowane użytkownikowi."
+msgid "Whether to show account balances in the contact list."
+msgstr "Określa, czy wyświetlać saldo kont na liście kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Obsługa usuwania echa"
+msgid "Compact contact list"
+msgstr "Zmniejszona lista kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Publikowanie położenia użytkownika"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Używanie urządzenia GPS do odnajdowania położenia"
+msgid "Hide main window"
+msgstr "Ukrycie głównego okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Używanie sieci komórkowej do odnajdowania położenia"
+msgid "Hide the main window."
+msgstr "Ukrycie głównego okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Używanie sieci do odnajdowania położenia"
+msgid "Default directory to select an avatar image from"
+msgstr "Domyślny katalog, z którego są wybierane awatary"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Domyślny katalog pobierania programu Empathy"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Ostatni katalog, z którego był wybierany awatar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Przeprowadzono migrację dzienników butterfly"
+msgid "Open new chats in separate windows"
+msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
+msgid "Always open a separate chat window for new chats."
+msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Automatyczne Å‚Ä…czenie siÄ™ podczas uruchamiania"
+msgid "Display incoming events in the status area"
+msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Zmniejszenie dokładności położenia"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
+"będą natychmiast prezentowane użytkownikowi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
+msgid "The position for the chat window side pane"
+msgstr "Położenie panelu bocznego okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Włączenie narzędzi programistycznych WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
+msgid "Show contact groups"
+msgstr "Wyświetlanie grup kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "WÅ‚Ä…czenie sprawdzania pisowni"
+msgid "Whether to show groups in the contact list."
+msgstr "Określa, czy wyświetlać grupy na liście kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Ukrycie głównego okna"
+msgid "Contact list sort criterion"
+msgstr "Kryterium porządkowania listy kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Ukrycie głównego okna."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Określa, jakie kryterium używać podczas porządkowania listy kontaktów. "
+"Domyślnie porządkowane jest według stanu kontaktów za pomocą wartości \"state"
+"\". Wartość \"name\" spowoduje porządkowanie według nazw kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Znak do dodania po uzupełnieniu pseudonimu"
+msgid "Use notification sounds"
+msgstr "Używanie dźwięków powiadomień"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
+msgid "Whether to play a sound to notify of events."
+msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Ścieżka używanego motywu Adium"
+msgid "Disable sounds when away"
+msgstr "Wyłączenie dźwięków podczas nieobecności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
-"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
-"Adium."
+"Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
+"zajętości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Odtworzenie dźwięku dla nadchodzących wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Odtworzenie dźwięku dla nowych rozmów"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Odtworzenie dźwięku dla wychodzącej wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
+msgid "Play a sound for new conversations"
+msgstr "Odtworzenie dźwięku dla nowych rozmów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
+msgid "Play a sound when a contact logs in"
+msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
+"sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ zaloguje"
+msgid "Play a sound when a contact logs out"
+msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ wyloguje"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Położenie podglądu kamery podczas rozmowy."
+msgid "Play a sound when we log in"
+msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Wyświetlanie salda na liście kontaktów"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Wyświetlanie awatarów"
+msgid "Play a sound when we log out"
+msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Wyświetlanie listy kontaktów w pokojach"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
+msgid "Enable popup notifications for new messages"
+msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Wyświetlanie kontaktów w trybie offline"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
+"wiadomości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Wyświetlanie protokołów"
+msgid "Disable popup notifications when away"
+msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Języki sprawdzania pisowni"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
+"zajętości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Domyślny katalog zapisu przesyłanych plików."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Ostatni katalog, z którego był wybierany awatar."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
+"wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Położenie panelu bocznego okna rozmowy"
+msgid "Pop up notifications when a contact logs in"
+msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
+"do trybu online."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
+msgid "Pop up notifications when a contact logs out"
+msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Wariant motywu używany do wyświetlania rozmowy w oknach rozmowy."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
+"do trybu offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Używanie graficznych emotikon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Używanie dźwięków powiadomień"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Używanie motywu dla pokoi rozmowy"
+msgid "Show contact list in rooms"
+msgstr "Wyświetlanie listy kontaktów w pokojach"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
+msgid "Chat window theme"
+msgstr "Motyw okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Określa, czy używać sieci do odnajdowania położenia."
+msgid "Chat window theme variant"
+msgstr "Wariant motywu okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Określa, czy przeprowadzono migrację dzienników butterfly."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Wariant motywu używany do wyświetlania rozmowy w oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
+msgid "Path of the Adium theme to use"
+msgstr "Ścieżka używanego motywu Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
-"bezczynności."
+"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
+"Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
+msgid "Enable WebKit Developer Tools"
+msgstr "Włączenie narzędzi programistycznych WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Określa, czy włączyć narzędzia programistyczne WebKit, takie jak Web "
 "Inspector."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informowanie innych użytkowników o pisaniu"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Określa, czy menedżery łączności powinny być używane do automatycznego "
-"rozłączenia/ponownego połączenia."
+"Określa, czy wysyłać stany rozmowy \"pisanie\" lub \"wstrzymano\". Obecnie "
+"nie wpływa na stan \"nieobecny\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
+msgid "Use theme for chat rooms"
+msgstr "Używanie motywu dla pokoi rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Określa, czy używać motywów dla pokoi rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Określa, czy włączyć filtr usuwania echa usługi PulseAudio."
+msgid "Spell checking languages"
+msgstr "Języki sprawdzania pisowni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
-"sieci."
+"Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
+"\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
+msgid "Enable spell checker"
+msgstr "WÅ‚Ä…czenie sprawdzania pisowni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
+msgid "Nick completed character"
+msgstr "Znak do dodania po uzupełnieniu pseudonimu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
+"podczas rozmowy grupowej."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
+msgid "Last account selected in Join Room dialog"
+msgstr "Ostatnie konto wybrane w oknie Dołącz do pokoju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
-"zajętości."
+"Ścieżka do obiektu D-Bus ostatnio wybranego konta do dołączenia do pokoju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
-"do trybu offline."
+msgid "Camera device"
+msgstr "UrzÄ…dzenie kamery"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
-"do trybu online."
+"Domyślne urządzenie kamery do użycia w wideorozmowach, np. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
-"wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
+msgid "Camera position"
+msgstr "Pozycja kamery"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
-"wiadomości."
+msgid "Position the camera preview should be during a call."
+msgstr "Położenie podglądu kamery podczas rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Określa, czy wyświetlać saldo kont na liście kontaktów."
+msgid "Echo cancellation support"
+msgstr "Obsługa usuwania echa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Określa, czy włączyć filtr usuwania echa usługi PulseAudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
+msgid "Show hint about closing the main window"
+msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
-"zajętości."
+"Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
+"przyciskiem \"x\" na pasku tytułowym."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
+msgid "Empathy can publish the user's location"
+msgstr "Publikowanie położenia użytkownika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
+msgid "Empathy can use the network to guess the location"
+msgstr "Używanie sieci do odnajdowania położenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
-"przyciskiem \"x\" na pasku tytułowym."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Określa, czy używać sieci do odnajdowania położenia."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Określa, czy używać motywów dla pokoi rozmowy."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Używanie sieci komórkowej do odnajdowania położenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Używanie urządzenia GPS do odnajdowania położenia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Zmniejszenie dokładności położenia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Określa, jakie kryterium używać podczas porządkowania listy kontaktów. "
-"Domyślnie porządkowane jest według nazwy kontaktów za pomocą wartości \"name"
-"\". Wartość \"state\" spowoduje porządkowanie według stanu kontaktu."
+"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ZarzÄ…dzanie kontami komunikatora i VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nie podano powodu"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Konta komunikatora i VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Zażądano zmiany stanu"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Przesłanie pliku zostało anulowane przez użytkownika"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Przesłanie pliku zostało anulowane przez drugą stronę"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Błąd podczas próby przesłania pliku"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strona nie może odebrać pliku"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nieznany powód"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Ukończono przesyłanie pliku, ale plik jest uszkodzony"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Przesyłanie plików nie jest obsługiwane przez zdalnego użytkownika"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Wybrany plik nie jest zwykłym plikiem"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Wybrany plik jest pusty"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nieodebrana rozmowa głosowa od użytkownika %s"
@@ -549,171 +604,140 @@ msgstr "Rozmowa głosowa z użytkownikiem %s"
 msgid "Call from %s"
 msgstr "Rozmowa głosowa od użytkownika %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Typ gniazda nie jest obsługiwany"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nie podano powodu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zażądano zmiany stanu"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Przesłanie pliku zostało anulowane przez użytkownika"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Przesłanie pliku zostało anulowane przez drugą stronę"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Błąd podczas próby przesłania pliku"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strona nie może odebrać pliku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nieznany powód"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Nieobecny"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nie podano powodu"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stan został zmieniony na offline"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "BÅ‚Ä…d sieci"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Uwierzytelnienie się nie powiodło"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "BÅ‚Ä…d szyfrowania"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Pseudonim jest już używany"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nie dostarczono certyfikatu"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Niezaufany certyfikat"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certyfikat wygasł"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certyfikat nieaktywny"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Nazwa komputera w certyfikacie nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Odcisk palca certyfikatu nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certyfikat został samodzielnie podpisany"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "BÅ‚Ä…d certyfikatu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Szyfrowanie nie jest dostępne"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certyfikat jest nieprawidłowy"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Połączenie zostało odrzucone"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Nie można ustanowić połączenia"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Połączenie zostało utracone"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ten zasób jest już połączony z serwerem"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "To konto jest już połączone z serwerem"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Połączenie zostało zastąpione nowym połączeniem używając tego samego zasobu"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Konto już istnieje na serwerze"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serwer jest obecnie zbyt zajęty, aby obsłużyć połączenie"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certyfikat używa niebezpiecznego algorytmu szyfrowania lub jest "
 "kryptograficznie słaby"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -721,24 +745,31 @@ msgstr ""
 "Długość certyfikatu serwera lub głębokość łańcucha certyfikatu serwera "
 "przekracza ograniczenie wymuszane przez bibliotekÄ™ kryptograficznÄ…"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Oprogramowanie jest za stare"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Wewnętrzny błąd"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Osoby w pobliżu"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japonia"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -746,7 +777,7 @@ msgstr[0] "%d sekundÄ™ temu"
 msgstr[1] "%d sekundy temu"
 msgstr[2] "%d sekund temu"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -754,7 +785,7 @@ msgstr[0] "%d minutÄ™ temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +793,7 @@ msgstr[0] "%d godzinÄ™ temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -770,7 +801,7 @@ msgstr[0] "%d dzień temu"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -778,7 +809,7 @@ msgstr[0] "%d tydzień temu"
 msgstr[1] "%d tygodnie temu"
 msgstr[2] "%d tygodni temu"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -786,224 +817,210 @@ msgstr[0] "%d miesiÄ…c temu"
 msgstr[1] "%d miesiÄ…ce temu"
 msgstr[2] "%d miesięcy emu"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "w przyszłości"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Nie odnaleziono hasła"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Hasło konta komunikatora dla %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Hasło dla pokoju rozmowy \"%s\" na koncie %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Wszystkie konta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Hasło"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serwer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Moje konta internetowe"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Konto %s jest modyfikowane przez %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Konta %s nie można modyfikować w programie Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Uruchom Moje konta internetowe"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Modyfikuj %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "Za_stosuj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
-msgstr "Zal_oguj siÄ™"
+msgstr "Zal_oguj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "To konto już istnieje na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Utworzenie nowego konta na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "A_nuluj"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Konto %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nowe konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Przykład:</b> MojaNazwaUżytkownika"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Hasło:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Zaawansowane"
+msgid "Screen _Name:"
+msgstr "_Nazwa użytkownika:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Przykład:</b> MojaNazwaUżytkownika"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Hasło:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamiętywanie hasła"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamiętaj hasło"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamiętywanie hasła"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nazwa użytkownika:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Serwer:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Hasło AIM:"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Zaawansowane"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Nazwa użytkownika AIM:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Hasło AIM:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Serwer:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Przykład:</b> nazwa_użytkownika"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamiętaj hasło"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Id_entyfikator logowania:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Przykład:</b> nazwa_użytkownika"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Identyfikator użytkownika GroupWise:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Hasło GroupWise:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Przykład:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Zest_aw znaków:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "UIN ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Hasło ICQ:"
 
@@ -1040,11 +1057,23 @@ msgstr "Opcje"
 msgid "None"
 msgstr "Brak"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Sieć"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Sieć:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Zestaw znaków:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serwery"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1052,14 +1081,6 @@ msgstr ""
 "Większość serwerów IRC nie wymaga hasła, więc w razie niepewności nie należy "
 "go podawać."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Sieć"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Sieć:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Pseudonim:"
@@ -1076,48 +1097,20 @@ msgstr "Komunikat podczas zakończenia:"
 msgid "Real name:"
 msgstr "ImiÄ™ i nazwisko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serwery"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Pseudonim IRC:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Sieć IRC:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Przykład:</b> użytkownik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Przykład:</b> użytkownik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Wymagane szyfrowanie (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "Ig_norowanie błędów certyfikatu SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Zastępuje ustawienia serwera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_orytet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Pseudonim IRC:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Zasób:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Nazwa użytkownika serwisu Facebook:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1130,179 +1123,203 @@ msgstr ""
 "aby wybrać nazwę użytkownika serwisu Facebook, jeśli jeszcze jej nie "
 "ustawiono."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Stare szyfrowanie SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Hasło serwisu Facebook:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Nazwa użytkownika serwisu Facebook:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Identyfikator Google:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Przykład:</b> użytkownik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Hasło Google:"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Przykład:</b> użytkownik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "Ig_norowanie błędów certyfikatu SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_orytet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Zasób:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Wymagane szyfrowanie (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Stare szyfrowanie SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Zastępuje ustawienia serwera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Identyfikator Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Hasło Jabbera:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Żądany identyfikator Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Hasło Jabbera:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Żądane hasło Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Przykład:</b> użytkownik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Identyfikator Windows Live:"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Hasło Windows Live:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adres _e-mail:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Pseu_donim:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "Na_zwisko:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "I_miÄ™:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nazwa _opublikowana:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Identyfikator Ja_bbera:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "Na_zwisko:"
+msgid "E-_mail address:"
+msgstr "Adres _e-mail:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nazwa _opublikowana:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Nazwa _użytkownika:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Przykład:</b> użytkownik@mój.serwer.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Nazwa użytkownika uwierzytelnienia:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Wykrywanie dowiÄ…zywania"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatyczne wykrywanie serwera STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Użycie tego konta do połączeń na telefony _stacjonarne i komórkowe"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorowanie błędów TLS"
+msgid "NAT Traversal Options"
+msgstr "Opcje przechodzenia NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Czas między aktualizacjami (w sekundach)"
+msgid "Proxy Options"
+msgstr "Opcje pośrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcje \"Keep-Alive\""
+msgid "Miscellaneous Options"
+msgstr "Różne opcje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Swobodne trasowanie"
+msgid "STUN Server:"
+msgstr "Serwer STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanizm:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatyczne wykrywanie serwera STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Różne opcje"
+msgid "Discover Binding"
+msgstr "Wykrywanie dowiÄ…zywania"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcje przechodzenia NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Serwer"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcje \"Keep-Alive\""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanizm:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcje pośrednika"
+msgid "Interval (seconds)"
+msgstr "Czas między aktualizacjami (w sekundach)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Nazwa użytkownika uwierzytelnienia:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Serwer STUN:"
+msgid "Loose Routing"
+msgstr "Swobodne trasowanie"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Serwer"
+msgid "Ignore TLS Errors"
+msgstr "Ignorowanie błędów TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Użycie tego konta do połączeń na telefony _stacjonarne i komórkowe"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Hasło konta SIP:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Identyfikator loginu SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Nazwa _użytkownika:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Hasło konta SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Id_entyfikator Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "Ig_norowanie zaproszeń konferencyjnych i pokoi rozmowy"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Ustawienia językowe listy pokoi:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Identyfikator Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Hasło Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Id_entyfikator Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Ustawienia językowe listy pokoi:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1341,61 +1358,65 @@ msgstr "Wszystkie pliki"
 msgid "Click to enlarge"
 msgstr "Kliknięcie powiększy"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Wystąpił błąd podczas rozpoczynania rozmowy głosowej"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Podany kontakt nie obsługuje rozmów głosowych"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Wybrany kontakt jest w trybie offline"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Wybrany kontakt nie jest prawidłowy"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Rozmowy alarmowe nie są obsługiwane przez ten protokół"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Brak wystarczających środków, aby zadzwonić"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Brak uprawnienia do zmiany tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" nie jest prawidłowym identyfikatorem kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1403,24 +1424,24 @@ msgstr ""
 "/part [<identyfikator pokoju rozmów>] [<przyczyna>]: opuszcza pokój rozmów, "
 "domyślnie bieżący"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <wiadomość>: wysyła wiadomość DZIA�ANIA do bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1430,11 +1451,11 @@ msgstr ""
 "wysyłania wiadomości zaczynającej się od znaku \"/\". Na przykład: \"/say /"
 "join jest używane do dołączenia do nowego pokoju rozmowy\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <identyfikator kontaktu>: wyświetla informacje o kontakcie"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1442,113 +1463,127 @@ msgstr ""
 "/help [<polecenie>]: wyświetla wszystkie obsługiwane polecenia. Jeśli podano "
 "<polecenie>, zostanie wyświetlone jej użycie."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Użycie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "niewystarczające saldo, aby wysłać wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Błąd podczas wysyłania wiadomości: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"niewystarczające saldo, aby wysłać wiadomość. <a href='%s'>Doładuj</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "brak możliwości"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nieprawidłowy kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "za długa wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "niezaimplementowane"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Błąd podczas wysyłania wiadomości: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temat:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temat ustawiony na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Temat ustawiony przez użytkownika %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Temat nie został określony"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(brak podpowiedzi)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj \"%s\" do słownika"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj \"%s\" do słownika %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonÄ™"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Wyślij"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Podpowiedzi pi_sowni"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Pobranie ostatnich dzienników się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "Użytkownik %s został rozłączony"
@@ -1556,12 +1591,12 @@ msgstr "Użytkownik %s został rozłączony"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Użytkownik %1$s został wyrzucony przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "Użytkownik %s został wyrzucony"
@@ -1569,17 +1604,17 @@ msgstr "Użytkownik %s został wyrzucony"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Użytkownik %1$s został zablokowany przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Użytkownik %s został zablokowany"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "Użytkownik %s opuścił pokój"
@@ -1589,17 +1624,17 @@ msgstr "Użytkownik %s opuścił pokój"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "Użytkownik %s dołączył do pokoju"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
@@ -1607,90 +1642,90 @@ msgstr "Użytkownik %s jest teraz znany jako %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Zachować hasło?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Nie teraz"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Ponów"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Błędne hasło. Proszę spróbować ponownie:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ten pokój jest chroniony hasłem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Dołącz"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Rozmowa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Nieznany lub nieprawidłowy identyfikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokowanie kontaktów jest tymczasowo niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blokowanie kontaktów jest niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Brak dostępu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Nie można zablokować kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Modyfikacja zablokowanych kontaktów"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1700,62 +1735,53 @@ msgstr "Zablokowane kontakty"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Usuń"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "S_kopiuj adres odnośnika"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Modyfikowanie informacji o kontakcie"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informacje osobiste"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Zablokować użytkownika %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Na pewno zablokować użytkownika \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "Za_blokuj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Zgł_oś ten kontakt jako obraźliwy"
@@ -1763,403 +1789,315 @@ msgstr[1] "Zgł_oś te kontakty jako obraźliwe"
 msgstr[2] "Zgł_oś te kontakty jako obraźliwe"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Z_decyduj później"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prośba o upoważnienie"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "Za_blokuj użytkownika"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Nie w grupach"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Ulubione osoby"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Na pewno usunąć grupę \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Usuwanie grupy"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Usuń"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Na pewno usunąć kontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Usuwanie kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Dodaj kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Za_blokuj kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Rozmowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "Rozmow_a głosowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Wideorozmowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Poprzednie rozmowy"
-
-# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Wyślij plik"
-
-# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Współdziel pulpit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Ulubione"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_macje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Modyfikuj"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Zapraszanie do tego pokoju"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_ZaproÅ› do pokoju rozmowy"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Z_decyduj później"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Wyszukiwanie kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "Wyszukaj:"
+msgstr "Wyszukiwanie:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Dodaj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nie odnaleziono kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Wiadomość z powitaniem:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Daj znać, jak pojawisz się w sieci. Dzięki."
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Wybór kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ImiÄ™ i nazwisko:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Numer telefonu:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adres e-mail:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Witryna WWW:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Urodziny:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ostatnio widziany:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Połączony z:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Wiadomość podczas nieobecności:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanały:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Kod ISO kraju:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Stan/województwo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Obszar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Budynek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Piętro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adres URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Poziom dokładności:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "BÅ‚Ä…d:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "BÅ‚Ä…d w pionie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "BÅ‚Ä…d w poziomie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Prędkość:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Kierunek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Prędkość wznoszenia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Długość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Szerokość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Wysokość n.p.m.:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Położenie"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y o %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Zapisanie awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Nie można zapisać awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Położenie</b> w dniu\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Informacje o kliencie"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Szczegóły osobiste"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Szczegóły kontaktu"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "ImiÄ™ i nazwisko"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Numer telefonu"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Adres e-mail"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Witryna WWW"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Urodziny"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Ostatnio widziany:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Połączony z:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Wiadomość podczas nieobecności:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "praca"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "dom"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "komórka"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "głosowa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferowane"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "pocztowy"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "paczka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identyfikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Położenie</b> w dniu\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Żądanie informacji…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Informacje o kliencie"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Wersja:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2167,107 +2105,181 @@ msgstr ""
 "Proszę wybrać grupy, w których ma się pojawić ten kontakt. Można wybrać "
 "więcej niż jedną grupę lub nie wybierać żadnej."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Dod_aj grupÄ™"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Wybór"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Następująca osoba zostanie zablokowana:"
 msgstr[1] "Następujące osoby zostaną zablokowane:"
 msgstr[2] "Następujące osoby zostaną zablokowane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Następująca osoba nie może zostać zablokowana:"
 msgstr[1] "Następujące osoby nie mogą zostać zablokowane:"
 msgstr[2] "Następujące osoby nie mogą zostać zablokowane:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Modyfikowanie informacji o kontakcie"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Połączone kontakty"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Wybór kontaktów do połączenia"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "PodglÄ…d nowego kontaktu"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakty zaznaczone na liście po lewej stronie zostaną połączone."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Wybór konta do umieszczenia tej rozmowy głosowej"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Komórka"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Praca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "Dom"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "Za_blokuj kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1018
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Rozmowa"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Rozmow_a głosowa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Wideorozmowa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Poprzednie rozmowy"
+
+# to jest w menu
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Wyślij plik"
+
+# to jest w menu
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Współdziel pulpit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Ulubione"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+msgid "gnome-contacts not installed"
+msgstr "Pakiet gnome-contacts nie jest zainstalowany"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Proszę zainstalować pakiet gnome-contacts, aby uzyskać dostęp do szczegółów "
+"kontaktów."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Infor_macje"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Połącz kontakty…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Zapraszanie do tego pokoju"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "_ZaproÅ› do pokoju rozmowy"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Dodaj kontakt…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Usuń i za_blokuj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Na pewno usunąć grupę \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Usuwanie grupy"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Usuń"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Na pewno usunąć kontakt \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2276,7 +2288,11 @@ msgstr ""
 "Na pewno usunąć metakontakt \"%s\"? Wszystkie kontakty tworzące metakontakt "
 "zostaną usunięte."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Usuwanie kontaktu"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2288,23 +2304,23 @@ msgstr[2] "Metakontakt zawierający %u kontaktów"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Położenie</b> w (dniu)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Online z telefonu lub urządzenia przenośnego"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nowa sieć"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Wybór sieci IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Przywróć listę _sieci"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Wybierz"
@@ -2317,91 +2333,48 @@ msgstr "nowy serwer"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Połączenie kontaktów"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Rozłącz…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Całkowicie rozdziela wyświetlany metakontakt na tworzące go kontakty."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Połącz"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Rozłączyć metakontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Na pewno rozłączyć ten metakontakt? Metakontakty zostaną całkowicie "
-"rozłączone na tworzące go kontakty."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Rozłącz"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Wyświetlenie"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Rozmowa w %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Rozmowa z użytkownikiem %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %e %B %Y, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2409,7 +2382,7 @@ msgstr[0] "%s sekunda"
 msgstr[1] "%s sekundy"
 msgstr[2] "%s sekund"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2417,150 +2390,196 @@ msgstr[0] "%s minuta"
 msgstr[1] "%s minuty"
 msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Rozmowa głosowa miała miejsce %s, została zakończona %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Zawsze"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Wszyscy"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kiedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Rozmowy tekstowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Przychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Wychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Nieodebrane rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Na pewno usunąć wszystkie dzienniki poprzednich rozmów?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Wyczyść wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Usunięcie od:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Wczytywanie...</span>"
+msgid "_File"
+msgstr "_Plik"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Rozmowa"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Edycja"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Usuń całą historię..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Wideo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Rozmowa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Edycja"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Wideo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Plik"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "strona 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Identyfikator kontaktu:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Wczytywanie...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakt jest w trybie offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Rozmowa"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Wybrany kontakt jest nieprawidłowy lub nieznany"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt nie obsługuje tego rodzaju rozmowy"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Żądana funkcjonalność nie jest zaimplementowana dla tego protokołu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nie można rozpocząć rozmowy z podanym kontaktem"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Użytkownik został zablokowany na tym kanale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ten kanał jest pełny"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Wymagane jest zaproszenie, aby dołączyć do tego kanału"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Nie można kontynuować podczas rozłączenia"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Odmowa dostępu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Wystąpił błąd podczas rozpoczynania rozmowy"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Proszę wpisać identyfikator lub numer telefonu kontaktu:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nowa rozmowa"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Wyślij obraz _wideo"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Wideorozmowa"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Rozmowa głosowa"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Rozmow_a głosowa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nowa rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Uwierzytelnienie konta <b>%s</b> się nie powiodło"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2597,12 +2616,8 @@ msgstr "Kliknięcie doda ten stan do ulubionych"
 msgid "Set status"
 msgstr "Ustaw stan"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Ustawienie obecności i obecnego stanu"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Własne wiadomości…"
 
@@ -2610,7 +2625,7 @@ msgstr "Własne wiadomości…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nowe konto %s"
@@ -2620,20 +2635,20 @@ msgid "Find:"
 msgstr "Wyszukiwanie:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Rozróżnianie wielkości liter"
+msgid "_Previous"
+msgstr "_Poprzednie"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Nie odnaleziono napisu"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Następne"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Rozróżnianie wielkości liter"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Poprzednie"
+msgid "Phrase not found"
+msgstr "Nie odnaleziono napisu"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2679,12 +2694,12 @@ msgstr "Rozmowa głosowa zakończona"
 msgid "Edit Custom Messages"
 msgstr "Modyfikowanie własnej wiadomości"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Zmodyfikowano wiadomość o %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Zwykły"
 
@@ -2762,34 +2777,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nazwa komputera w certyfikacie: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Kontynuuj"
+msgid "C_ontinue"
+msgstr "K_ontynuuj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Niezaufane połączenie"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "To połączenie jest niezaufane. Kontynuować mimo to?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamiętanie tego wyboru dla przyszłych połączeń"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Szczegóły certyfikatu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Nie można otworzyć adresu URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Brak wolnego miejsca, aby zapisać plik"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2798,7 +2817,7 @@ msgstr ""
 "Wymagane jest %s wolnego miejsca, aby zapisać ten plik, ale dostępne jest "
 "tylko %s. Proszę wybrać inne położenie."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Plik przychodzący od użytkownika %s"
@@ -2970,39 +2989,31 @@ msgstr "zachodnie"
 msgid "Vietnamese"
 msgstr "wietnamskie"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Wybrany kontakt nie może odbierać plików."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Wybrany kontakt jest w trybie offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Brak komunikatu błędu"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Wiadomość (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Bez Å‚Ä…czenia podczas uruchamiania"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Bez wyświetlania listy kontaktów lub innych okien podczas uruchamiania"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
-msgstr " - komunikator Empathy"
+msgstr "- komunikator Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Błąd podczas nawiązywania połączenia z menedżerem kont"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3050,230 +3061,91 @@ msgstr ""
 "- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-130159 USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Komunikator dla środowiska GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr "Aviary.pl <gnomepl@aviary.pl>, 2008, 2009, 2010, 2011"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Wystąpił błąd podczas importowania kont."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Wystąpił błąd podczas przetwarzania szczegółów konta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Wystąpił błąd podczas tworzenia konta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Wystąpił błąd."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Komunikat błędu: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Można wrócić i spróbować ponownie wprowadzić szczegóły konta lub zakończyć "
-"tego asystenta i dodać konta później z menu Edycja."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Rodzaj posiadanego konta rozmów:"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Inne posiadane konta rozmów do ustawienia:"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Proszę wprowadzić szczegóły konta"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Rodzaj konta rozmów do utworzenia:"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Utworzyć inne konta rozmów?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Proszę wprowadzić szczegóły nowego konta"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Za pomocą programu Empathy można rozmawiać z ludźmi w sieci będącymi w "
-"pobliżu oraz przyjaciółmi i znajomymi, którzy używają Google Talk, AIM, "
-"Windows Live i wielu innych komunikatorów. Za pomocą mikrofonu lub kamery "
-"internetowej można także prowadzić rozmowy głosowe i wideokonferencje."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Czy konto było już używane za pomocą innego komunikatora?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Tak, zaimportuj szczegóły konta z "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Tak, wprowadzę teraz szczegóły konta"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nie, chcę utworzyć nowe konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nie, chcę na razie widzieć tylko osoby w sieci będące w pobliżu"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Proszę wybrać konta do zaimportowania:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Tak"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nie, to na razie wszytko"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Program Empathy może automatycznie wykrywać i umożliwiać rozmowę z osobami "
-"połączonymi do tej samej sieci. Aby używać tej funkcji, proszę sprawdzić, "
-"czy poniższe dane są poprawne. Można je łatwo zmienić w późniejszym czasie "
-"lub wyłączyć tę funkcję używając okna \"Konta\""
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Edycja->Konta"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_Nie chcę na razie włączać tej funkcji"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Nie będzie można rozmawiać z osobami połączonymi do lokalnej sieci, jeśli "
-"pakiet telepathy-salut nie zostanie zainstalowany. Aby włączyć tę funkcję, "
-"proszę zainstalować pakiet telepathy-salut i utworzyć konto \"Osoby w pobliżu"
-"\" z okna Konta"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Pakiet telepathy-salut nie jest zainstalowany"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asystent kont komunikatora i VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Witamy w programie Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importowanie istniejÄ…cych kont"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Proszę wprowadzić dane osobiste"
+msgstr "Aviary.pl <gnomepl@aviary.pl>, 2008, 2009, 2010, 2011, 2012"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Modyfikacje konta %s nie zostały zapisane."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Nowe konto nie zostało jeszcze zapisane."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "�ączenie…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Rozłączony — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Offline — brak połączenia z siecią"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nieznany stan"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"To konto zostało wyłączone, ponieważ używa ono starego, nieobsługiwanego "
+"mechanizmu. Proszę zainstalować pakiet telepathy-haze i ponownie uruchomić "
+"sesję, aby migrować konto."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Offline — konto jest wyłączone"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Za chwilÄ™ nastÄ…pi utworzenie nowego konta, co\n"
-"spowoduje utratę zmian. Na pewno kontynuować?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Modyfikacja parametrów połączenia"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Pobranie informacji osobistych z serwera się nie powiodło."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Proszę przejść do trybu online, aby modyfikować informacje osobiste."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Modyfikuj parametry połączenia..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Na pewno usunąć \"%s\" z komputera?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Nie usunie to konta na serwerze."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3282,15 +3154,23 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_WÅ‚Ä…czone"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "Wyłą_czone"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Pomiń"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "P_ołącz"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3302,19 +3182,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Wczytywanie informacji o koncie"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Brak zainstalowanych protokołów"
+msgid "_Import…"
+msgstr "_Zaimportuj…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokół:"
+msgid "Loading account information"
+msgstr "Wczytywanie informacji o koncie"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3322,132 +3198,116 @@ msgstr ""
 "Aby dodać nowe konto należy najpierw zainstalować moduł obsługi dla każdego "
 "wymaganego protokołu."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Zaimportuj…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Brak zainstalowanych mechanizmów protokołów"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Osoby w pobliżu"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Głośność"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Panel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Wejście dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Wejście obrazu"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Panel wybierania"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Szczegóły"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Rozmowa głosowa z użytkownikiem %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Adres IP widziany przez komputer"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adres IP widziany przez serwer w Internecie"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adres IP elementu widziany przez drugÄ… stronÄ™"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Adres IP serwera odpowiedzi"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Adres IP grupy multikastowej"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nieznany"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Połączony — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Szczegóły techniczne"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3456,8 +3316,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
 "używanego przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3466,8 +3326,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
 "przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3476,27 +3336,27 @@ msgstr ""
 "Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
 "się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Wystąpił błąd sieci"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty wideo wymagane dla tej rozmowy nie sÄ… zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3507,161 +3367,213 @@ msgstr ""
 "\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
 "w menu Pomoc."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Wystąpił błąd mechanizmu rozmowy"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Osiągnięto koniec strumienia"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nie można utworzyć strumienia dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nie można utworzyć strumienia obrazu"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Dźwięk"
+msgid "_Call"
+msgstr "_Zadzwoń"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Dekoder:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Wyłącz kamerę"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Wyświetl panel wybierania"
+msgid "_Settings"
+msgstr "_Ustawienia"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Koder:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Widok"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Rozłącz"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Pomo_c"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Rozłącza bieżącą rozmowę"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Spis treści"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalny kandydat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debugowanie"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Zmaksymalizuj"
+msgid "Swap camera"
+msgstr "Przełącz kamery"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Zminimalizuj"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Zdalny kandydat:"
+msgid "Maximise me"
+msgstr "Zmaksymalizuj"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Wyślij dźwięk"
+msgid "Disable camera"
+msgstr "Wyłącz kamerę"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Wyślij obraz wideo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Rozłącz"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Wyświetl panel wybierania"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Rozłącza bieżącą rozmowę"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Wideorozmowa"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Rozpocznij wideorozmowÄ™"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Rozpocznij rozmowę głosową"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Przełącz kamery"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Przełącza przesyłanie dźwięku"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Przełącza przesyłanie obrazu wideo"
+msgid "Show dialpad"
+msgstr "Wyświetl panel wybierania"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nieznany"
+msgid "Display the dialpad"
+msgstr "Wyświetl panel wybierania"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Wyślij obraz wideo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Wideorozmowa"
+msgid "Toggle video transmission"
+msgstr "Przełącza przesyłanie obrazu wideo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Zadzwoń"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Wyślij dźwięk"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Spis treści"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Przełącza przesyłanie dźwięku"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Debugowanie"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Koder:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Pomo_c"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Dekoder:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Zdalny kandydat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Ustawienia"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalny kandydat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Widok"
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Zamknąć to okno?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Zamknięcie tego okna spowoduje opuszczenie pokoju %s. Wiadomości nie będą "
+"odbierane aż do ponownego dołączenia."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Zamknięcie tego okna spowoduje opuszczenie pokoju rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+msgstr[1] ""
+"Zamknięcie tego okna spowoduje opuszczenie %u pokojów rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+msgstr[2] ""
+"Zamknięcie tego okna spowoduje opuszczenie %u pokojów rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Opuścić %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Wiadomości z tego pokoju rozmów nie będą odbierane aż do ponownego "
+"dołączenia."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zamknij okno"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Opuść pokój"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3669,7 +3581,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
 msgstr[1] "%s (%d nieprzeczytane)"
 msgstr[2] "%s (%d nieprzeczytanych)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3677,7 +3589,7 @@ msgstr[0] "%s (i %u inna)"
 msgstr[1] "%s (i %u inne)"
 msgstr[2] "%s (i %u innych)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3685,7 +3597,7 @@ msgstr[0] "%s (%d nieprzeczytana od innych)"
 msgstr[1] "%s (%d nieprzeczytane od innych)"
 msgstr[2] "%s (%d nieprzeczytanych od innych)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3693,11 +3605,11 @@ msgstr[0] "%s (%d nieprzeczytana od wszystkich)"
 msgstr[1] "%s (%d nieprzeczytane od wszystkich)"
 msgstr[2] "%s (%d nieprzeczytanych od wszystkich)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3705,69 +3617,69 @@ msgstr[0] "Wysyłanie %d wiadomości"
 msgstr[1] "Wysyłanie %d wiadomości"
 msgstr[2] "Wysyłanie %d wiadomości"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Pisze wiadomość."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Wyczyść"
+msgid "_Conversation"
+msgstr "_Rozmowa"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "_Wyczyść"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Wstaw _emotikonÄ™"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Ulubiony pokój rozmowy"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Zaproś _uczestnika…"
+msgid "Notify for All Messages"
+msgstr "Powiadamianie o wszystkich wiadomościach"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "PrzenieÅ› kartÄ™ w l_ewo"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Lista kontaktów"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "PrzenieÅ› kartÄ™ w p_rawo"
+msgid "Invite _Participant…"
+msgstr "Zaproś _uczestnika…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Powiadamianie o wszystkich wiadomościach"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Rozmowa"
+msgid "_Tabs"
+msgstr "_Karty"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Odłącz kartę"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Ulubiony pokój rozmowy"
+msgid "_Previous Tab"
+msgstr "_Poprzednia karta"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Następna karta"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Poprzednia karta"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Cofnij zamknięcie karty"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Lista kontaktów"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "PrzenieÅ› kartÄ™ w l_ewo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Karty"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "PrzenieÅ› kartÄ™ w p_rawo"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Cofnij zamknięcie karty"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Odłącz kartę"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3781,100 +3693,100 @@ msgstr "Pokój"
 msgid "Auto-Connect"
 msgstr "Automatyczne Å‚Ä…czenie"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ZarzÄ…dzanie ulubionymi pokojami"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "PrzychodzÄ…ca rozmowa wideo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Przychodząca rozmowa głosowa"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Wideorozmowa przychodząca od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Odrzuć"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Odbierz"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Odbierz z obrazem wideo"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Wideorozmowa przychodząca od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Zaproszenie do pokoju"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Zaproszenie do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Użytkownik %s zaprasza do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odmów"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s zaprosił użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Zaproszono użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Plik przychodzący od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Hasło wymagane"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s prosi o dostęp do informacji o obecności użytkownika online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3884,105 +3796,105 @@ msgstr ""
 "Wiadomość: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s o prędkości %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Odbieranie pliku \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Wysyłanie pliku \"%s\" do użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Błąd podczas odbierania pliku \"%s\" od użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "BÅ‚Ä…d podczas odbierania pliku"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Błąd podczas wysyłania pliku \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Błąd podczas wysyłania pliku"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "Otrzymano plik \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Wysłano \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Ukończono przesyłanie pliku"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Oczekiwanie na odpowiedź drugiej strony"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sprawdzanie spójności pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obliczanie sumy kontrolnej pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Plik"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Pozostało"
 
@@ -3994,7 +3906,11 @@ msgstr "Przesyłanie plików"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Usuwa ukończone, anulowane lub nieudane przesyłania plików z listy"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Zaimportuj"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4002,171 +3918,197 @@ msgstr ""
 "Nie odnaleziono kont do zaimportowania. Program Empathy obecnie obsługuje "
 "importowanie kont tylko z programu Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importowanie kont"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
-msgstr "Zaimportuj"
+msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Źródło"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Wprowadź hasło"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Należy ustawić konto, aby wyświetlić kontakty."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nie odnaleziono wyników"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Konta %s nie mogą być używane, dopóki oprogramowanie %s nie zostanie "
+"zaktualizowane."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Zaktualizuj oprogramowanie..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Połącz ponownie"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Modyfikuj konto"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zamknij"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Doładuj %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Doładowuje konto kredytowe"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Doładuj..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Należy włączyć jedno z kont, aby wyświetlić kontakty."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Należy włączyć konto %s, aby wyświetlić kontakty."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista kontaktów"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakty na _mapie"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Ustawienia konta"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Saldo kredytowe"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nowa rozmowa…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Znajdź na _liście kontaktów"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nowa _rozmowa głosowa…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Dołącz do _ulubionych"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Wyszukaj kontakty…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ZarzÄ…dzaj ulubionymi"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Przesyłanie plików"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Zwykły r_ozmiar"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "K_ontakty w trybie offline"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nowa _rozmowa głosowa…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Wyświetlanie p_rotokołów"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Zwykły rozmiar z _awatarami"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo kredytowe"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakty na _mapie"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Konta"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Za_blokowane kontakty"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencje"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Wyświetlanie p_rotokołów"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Znajdź na _liście kontaktów"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Porządkowanie według _nazwy"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Porządkowanie według _stanu"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Konta"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Zwykły rozmiar z _awatarami"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Za_blokowane kontakty"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Zwykły r_ozmiar"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Zmniejszony ro_zmiar"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Przesyłanie plików"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Pokój"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Dołącz…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nowa rozmowa…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "K_ontakty w trybie offline"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "I_nformacje osobiste"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Pokój"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Dołącz do _ulubionych"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Wyszukaj kontakty…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "ZarzÄ…dzaj ulubionymi"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Pokój rozmowy"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Członkowie"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4179,22 +4121,27 @@ msgstr ""
 "Wymagane hasło: %s\n"
 "Członkowie: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Tak"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nie"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Nie można uruchomić listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Nie można zatrzymać listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Nie można wczytać listy pokoi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Dołączenie do pokoju"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4204,6 +4151,10 @@ msgstr ""
 "pokoi na liście."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Pokój:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4211,180 +4162,196 @@ msgstr ""
 "Proszę wprowadzić adres serwera obsługującego pokój lub pozostawić puste, "
 "jeśli pokój znajduje się na tym samym serwerze co bieżące konto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Dołączenie do pokoju"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Nie można wczytać listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Pokój:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Otrzymano wiadomość"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nowa rozmowa"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Kontakt przeszedł do trybu online"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakt przeszedł do trybu offline"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
-msgstr "Konto połączone"
+msgstr "Połączono konto"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
-msgstr "Konto rozłączone"
+msgstr "Rozłączono konto"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Język"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo! Czemuż ty jesteś Romeo!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Wyrzecz się swego rodu, rzuć tę nazwę!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Lub jeśli tego nie możesz uczynić,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "To przysiąż wiernym być mojej miłości,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "A ja przestanę być z krwi Kapuletów."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Użytkownik Julia został rozłączony"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencje"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "_Emotikony jako obrazy"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Lista kontaktów w pokojach"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "WyglÄ…d"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Zachowanie"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Rozpoczynanie rozmów w:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Motyw _rozmowy:"
+msgid "new ta_bs"
+msgstr "nowych _kartach"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
+msgid "new _windows"
+msgstr "nowych _oknach"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Wyświetlanie zdarzeń przychodzących w obszarze powiadamiania"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Automatycznie Å‚Ä…czenie podczas _uruchamiania"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Usuwanie echa zwiększa czystość głosu użytkownika dla osoby po drugiej "
-"stronie, ale może powodować problemy na niektórych komputerach. Jeśli "
-"słychać dziwne dźwięki lub piski podczas rozmów, to należy spróbować "
-"wyłączyć usuwanie echa i ponownie rozpocząć rozmowę głosową."
+msgid "Log conversations"
+msgstr "Zapisywanie rozmów do dziennika"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
+msgid "Behavior"
+msgstr "Zachowanie"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu offline"
+msgid "General"
+msgstr "Ogólne"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Powiadomienia, kiedy okno _rozmowy jest nieaktywne"
+msgid "_Enable bubble notifications"
+msgstr "Wy_skakujÄ…ce powiadomienia"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Sprawdzanie pisowni dla języków:"
+msgid "Disable notifications when _away or busy"
+msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Ogólne"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Powiadomienia, kiedy okno _rozmowy jest nieaktywne"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Poziom wejściowy:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Głośność wejścia:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu offline"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Powiadomienia"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Źródła położenia:"
+msgid "_Enable sound notifications"
+msgstr "Powia_domienia dźwiękowe"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Zapisywanie rozmów do dziennika"
+msgid "Disable sounds when _away or busy"
+msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Powiadomienia"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Odtwarzanie dźwięków zdarzeń"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Dźwięki"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Prywatność"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usuwanie _echa w celu zwiększenia jakości rozmowy"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Usuwanie echa zwiększa czystość głosu użytkownika dla osoby po drugiej "
+"stronie, ale może powodować problemy na niektórych komputerach. Jeśli "
+"słychać dziwne dźwięki lub piski podczas rozmów, to należy spróbować "
+"wyłączyć usuwanie echa i ponownie rozpocząć rozmowę głosową."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publikowanie położenia kontaktom"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
@@ -4393,295 +4360,296 @@ msgstr ""
 "miasto, stan/województwo i kraj. Koordynaty GPS będą dokładne do 1 miejsca "
 "po przecinku."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "_Emotikony jako obrazy"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Lista kontaktów w pokojach"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Dźwięki"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Sprawdzanie pisowni"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Lista języków odzwierciedla stan faktycznie zainstalowanych słowników."
-
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Motywy"
+msgid "_Reduce location accuracy"
+msgstr "_Zmniejszenie dokładności położenia"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usuwanie _echa w celu zwiększenia jakości rozmowy"
+msgid "Privacy"
+msgstr "Prywatność"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Wariant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "Automatycznie Å‚Ä…czenie podczas _uruchamiania"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Telefon komórkowy"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "Wy_skakujÄ…ce powiadomienia"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Sieć (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "Powia_domienia dźwiękowe"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Źródła położenia:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Lista języków odzwierciedla stan faktycznie zainstalowanych słowników."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Sieć (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Sprawdzanie pisowni dla języków:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Otwieranie nowych rozmów w oddzielnych oknach"
+msgid "Spell Checking"
+msgstr "Sprawdzanie pisowni"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publikowanie położenia kontaktom"
+msgid "Chat Th_eme:"
+msgstr "Motyw _rozmowy:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Wariant:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "_Zmniejszenie dokładności położenia"
+msgid "Themes"
+msgstr "Motywy"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stan"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zadzwoń jeszcze raz"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera jest wyłączona"
+msgid "Redial"
+msgstr "Wybierz ponownie"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera jest włączona"
+msgid "V_ideo"
+msgstr "_Wideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Obraz jest wyłączony"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
+msgid "Video Preview"
+msgstr "PodglÄ…d obrazu"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Włączenie kamery i wysyłania obrazu"
+msgid "Video On"
+msgstr "Obraz jest włączony"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Włączenie kamery, ale bez wysyłania obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Zadzwoń jeszcze raz"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "PodglÄ…d"
+msgid "Camera Off"
+msgstr "Kamera jest wyłączona"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Wybierz ponownie"
+msgid "Disable camera and stop sending video"
+msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Wideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "PodglÄ…d"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Obraz jest wyłączony"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Włączenie kamery, ale bez wysyłania obrazu"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Obraz jest włączony"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera jest włączona"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "PodglÄ…d obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Włączenie kamery i wysyłania obrazu"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Widok mapy kontaktów"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Odnośnik serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odpowiedź serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Dane są za duże na jeden raz. Proszę zapisać dzienniki do pliku."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Okno debugowania"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Wyślij do serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Poziom "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informacje"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Poziom"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Wybrany menedżer połączenia nie obsługuje rozszerzenia zdalnego debugowania."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Zaproszenie uczestnika"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Proszę wybrać kontakt do zaproszenia do rozmowy:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "ZaproÅ›"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Bez wyświetlania żadnych okien; wykonuje zadanie (np. importowanie) i kończy "
 "działanie"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Bez wyświetlania żadnych okien, o ile istnieją tylko konta \"Osób w pobliżu\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Początkowo wybiera podane konto (np. gabble/jabber/foo_40przykład_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<identyfikator-konta>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
-msgstr "- Konta programu Empathy"
+msgstr "- konta programu Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Konta programu Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Wyświetla konkretną usługę"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- debuger programu Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Debuger programu Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
-msgstr " - komunikator Empathy"
+msgstr "- komunikator Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odpowiedz"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Odbierz"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odbierz z obrazem wideo"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odmów"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Zaakceptuj"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Wprowadź"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
@@ -4690,28 +4658,71 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Odłożone"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Wycisz"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Czas trwania"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Obecnie saldo wynosi %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Brak wystarczających środków na tę rozmowę głosową."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Doładuj"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Rozróżnianie wielkości liter"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Rodzaj posiadanego konta rozmów:"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodawanie nowego konta"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Osoby w pobliżu"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Program Empathy może automatycznie wykrywać i umożliwiać rozmowę z osobami "
+"połączonymi do tej samej sieci. Aby używać tej funkcji, proszę sprawdzić, "
+"czy poniższe dane są poprawne."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Można je łatwo zmienić w późniejszym czasie lub wyłączyć tę funkcję "
+"wybierając <span style=\"italic\">Edycja → Konta</span> na liście kontaktów."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f6ac546b..bd45e6a17 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,538 +4,592 @@
 # Luiz Guaraldo <software.livre@terra.com.br>, 2004.
 # André Filipe de Assunção e Brito <decko@ufpr.br>, 2007.
 # Og Maciel <ogmaciel@gnome.org>, 2007-2009, 2011.
-# Djavan Fagundes <djavan@comum.org>, 2008, 2010.
+# Djavan Fagundes <djavan@comum.org>, 2008, 2010, 2012.
 # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008-2009.
 # Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2008.
 # Taylon Silmer <taylonsilva@gmail.com>, 2009.
 # Michel Recondo <michel@recondo.com.br>, 2009.
 # Vladimir Melo <vmelo@gnome.org>, 2009.
 # Rodrigo L. M. Flores <mail@rodrigoflores.org>, 2009.
-# André Gondim <andregondim@ubuntu.com>, 2009.
-# Jonh Wendell <jwendell@gnome.org>, 2009, 2010.
+# André Gondim <In Memoriam>, 2009.
 # Henrique P. Machado <hpmachado@gnome.org>, 2010.
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Felipe Borges <felipe10borges@gmail.com>, 2011.
 # Antonio Fernandes C. Neto <fernandesn@gnome.org>, 2011.
+# Jonh Wendell <jwendell@gnome.org>, 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-15 19:02+0000\n"
-"PO-Revision-Date: 2011-09-15 16:24-0300\n"
-"Last-Translator: Antonio Fernandes C. Neto <fernandesn@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 16:00+0000\n"
+"PO-Revision-Date: 2012-03-09 11:05-0200\n"
+"Last-Translator: Djavan Fagundes <djavan@comum.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse no Google Talk, Facebook, MSN e muitos outros serviços de bate-papo"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de mensagens instantâneas"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensageiro Instantâneo Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de mensagens instantâneas"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Converse no Google Talk, Facebook, MSN e muitos outros serviços de bate-papo"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de Mensagem e VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gerencia contas de mensagem e VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Sempre abrir uma janela de bate-papo separada para novos bate-papos."
+msgid "Connection managers should be used"
+msgstr "Devem ser utilizados gerenciadores de conexão"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Volume da chamada"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Usa gerenciadores de conexão para desconectar/reconectar automaticamente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Volume de chamada, como uma porcentagem."
+msgid "Empathy should auto-connect on startup"
+msgstr "Conectar-se automaticamente ao iniciar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Dispositivo da câmera"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Conecta automaticamente às suas contas ao iniciar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Posição da câmera"
+msgid "Empathy should auto-away when idle"
+msgstr "O Empathy deve definir como ausente automaticamente quando ocioso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Caracteres para adicionar depois do apelido quando usar completamento de "
-"apelidos (tab) em bate-papo em grupo."
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Deve ir ao modo ausente automaticamente se o usuário estiver ocioso."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema para a janela de bate-papo"
+msgid "Empathy default download folder"
+msgstr "Pasta padrão de download do Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Variante do tema da janela de conversa"
+msgid "The default folder to save file transfers in."
+msgstr "A pasta padrão onde salvar os arquivos transferidos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Lista, separada por vírgulas, de idiomas de verificação ortográfica para "
-"usar (ex: \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Número mágico usado para verificar se deve executar tarefas de limpeza"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Lista de contatos compacta"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c usa esse número para verificar se as tarefas de "
+"limpeza devem ser executadas ou não. Usuários não devem mudar essa chave "
+"manualmente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Devem ser utilizados gerenciadores de conexão"
+msgid "Show offline contacts"
+msgstr "Mostra contatos desconectados"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Critério de ordenação da lista de contatos"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Mostra os contatos que estão desconectados na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Dispositivo de câmera padrão para uso em chamadas de vídeo, por exemplo, /"
-"dev/video0."
+msgid "Show avatars"
+msgstr "Mostra avatares"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Desabilitar notificações quando ausente"
+msgid "Show protocols"
+msgstr "Exibir protocolos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Desabilitar sons quando ausente"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Mostra os protocolos para contatos na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Exibir eventos recebidos na área de status"
+msgid "Show Balance in contact list"
+msgstr "Mostrar créditos na lista de contatos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Exibe eventos recebidos na área de status. Se falso, apresenta-os "
-"imediatamente ao usuário."
+msgid "Whether to show account balances in the contact list."
+msgstr "Mostra os créditos das contas na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Suporte para cancelamento de eco"
+msgid "Compact contact list"
+msgstr "Lista de contatos compacta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "O Empathy pode publicar a localização do usuário"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Mostra a lista de contatos no modo compacto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "O Empathy pode usar o GPS para adivinhar a localização"
+msgid "Hide main window"
+msgstr "Ocultar janela principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
+msgid "Hide the main window."
+msgstr "Oculta a janela principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "O Empathy pode usar a rede para adivinhar a localização"
+msgid "Default directory to select an avatar image from"
+msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Pasta padrão de download do Empathy"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "O último diretório onde uma imagem de avatar foi escolhida."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "O Empathy migrou os registros do butterfly"
+msgid "Open new chats in separate windows"
+msgstr "Abre novos bate-papos em janelas separadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "O Empathy deve definir como ausente automaticamente quando ocioso"
+msgid "Always open a separate chat window for new chats."
+msgstr "Sempre abrir uma janela de bate-papo separada para novos bate-papos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Conectar-se automaticamente ao iniciar"
+msgid "Display incoming events in the status area"
+msgstr "Exibir eventos recebidos na área de status"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "O Empathy deve reduzir a precisão da localização"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Exibe eventos recebidos na área de status. Se falso, apresenta-os "
+"imediatamente ao usuário."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
+msgid "The position for the chat window side pane"
+msgstr "A posição da janela de bate-papo no painel lateral"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"A posição armazenada (em pixels) da janela de bate-papo no painel lateral."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Habilitar notificação para novas mensagens"
+msgid "Show contact groups"
+msgstr "Mostra grupos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Habilitar verificador ortográfico"
+msgid "Whether to show groups in the contact list."
+msgstr "Mostra ou não os grupos na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Ocultar janela principal"
+msgid "Contact list sort criterion"
+msgstr "Critério de ordenação da lista de contatos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Oculta a janela principal."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Qual critério usar para ordernar a lista de contatos. O padrão é ordernar "
+"pelo estado do contato, se o valor for \"state\". Se o valor for \"name\", a "
+"ordenação é feita pelo nome."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Caractere de completamento de apelidos"
+msgid "Use notification sounds"
+msgstr "Usa sons de notificação"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Abre novos bate-papos em janelas separadas"
+msgid "Whether to play a sound to notify of events."
+msgstr "Reproduzir um som de notificação para eventos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Caminho do tema do Adium para utilizar"
+msgid "Disable sounds when away"
+msgstr "Desabilitar sons quando ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Caminho do tema do Adium para usar se o tema usado para este bate-papo é do "
-"Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reproduz um som quando receber mensagens"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Reproduz um som para novas conversas"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Reproduzir um som de notificação para mensagens recebidas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reproduz um som para mensagens enviadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Reproduz um som quando um contato conectar"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Reproduzir um som de notificação para mensagens enviadas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Reproduz um som quando um contato desconectar"
+msgid "Play a sound for new conversations"
+msgstr "Reproduz um som para novas conversas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Reproduz um som quando conectarmos"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Reproduzir um som de notificação para novas conversas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Reproduz um som quando desconectarmos"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproduz um som quando um contato conectar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Mostra notificações se a janela de bate-papo não estiver em foco"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Reproduz ou não um som de notificação para contatos conectando-se à rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Mostra notificações quando um contato conecta"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproduz um som quando um contato desconectar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Mostra notificações quando um contato desconecta"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Reproduz ou não um som de notificação para contatos desconectando-se da rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Posição de visualização da câmera que deve estar durante a chamada."
+msgid "Play a sound when we log in"
+msgstr "Reproduz um som quando conectarmos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Mostrar créditos na lista de contatos"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Mostra avatares"
+msgid "Play a sound when we log out"
+msgstr "Reproduz um som quando desconectarmos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Mostra lista de contatos nas salas"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Mostra dica sobre como fechar a janela principal"
+msgid "Enable popup notifications for new messages"
+msgstr "Habilitar notificação para novas mensagens"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Mostra contatos desconectados"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Mostra uma notificação quando receber uma nova mensagem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Exibir protocolos"
+msgid "Disable popup notifications when away"
+msgstr "Desabilitar notificações quando ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Idiomas para verificação ortográfica"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Mostra uma notificação quado estiver ausente ou ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "A pasta padrão onde salvar os arquivos transferidos."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Mostra notificações se a janela de bate-papo não estiver em foco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "O último diretório onde uma imagem de avatar foi escolhida."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Mostra uma notificação quando receber uma nova mensagem mesmo se a janela de "
+"bate papo estiver aberta, mas não estiver com o foco."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "A posição da janela de bate-papo no painel lateral"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Mostra notificações quando um contato conecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"A posição armazenada (em pixels) da janela de bate-papo no painel lateral."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Mostra uma notificação quando um contato conectar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Mostra notificações quando um contato desconecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"A variação do tema que é usada para exibir a conversa em janelas de bate-"
-"papo."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Mostra uma notificação quando um contato estiver desconectado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usa smileys gráficos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Usa sons de notificação"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Converte os smileys para imagens gráficas durante as conversas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Usa tema para salas de bate-papo"
+msgid "Show contact list in rooms"
+msgstr "Mostra lista de contatos nas salas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Publica a localização do usuário para seus contatos."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Mostra a lista de contatos nas salas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Usa o GPS para adivinhar a localização."
+msgid "Chat window theme"
+msgstr "Tema para a janela de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Usa a rede de celular para adivinhar a localização."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Usa a rede para adivinhar a localização."
+msgid "Chat window theme variant"
+msgstr "Variante do tema da janela de conversa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Pergunta sobre migrar os registros do butterfly."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"A variação do tema que é usada para exibir a conversa em janelas de bate-"
+"papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Conecta automaticamente às suas contas ao iniciar."
+msgid "Path of the Adium theme to use"
+msgstr "Caminho do tema do Adium para utilizar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Deve ir ao modo ausente automaticamente se o usuário estiver ocioso."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Caminho do tema do Adium para usar se o tema usado para este bate-papo é do "
+"Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Reduz a precisão de localização por razões de privacidade."
+msgid "Enable WebKit Developer Tools"
+msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Habilita ferramentas de desenvolvedor WebKit, como o Web Inspector."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informar aos outros usuários quando você está digitando"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Usa gerenciadores de conexão para desconectar/reconectar automaticamente."
+"Envia ou não os estados \"composing\" ou \"paused\" no bate-papo. Atualmente "
+"não afeta o estado \"gone\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
-"ortográfica."
+msgid "Use theme for chat rooms"
+msgstr "Usa tema para salas de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Converte os smileys para imagens gráficas durante as conversas."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Usa o tema em salas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Habilitar filtro de cancelamento de eco do Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Idiomas para verificação ortográfica"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Reproduz ou não um som de notificação para contatos conectando-se à rede."
+"Lista, separada por vírgulas, de idiomas de verificação ortográfica para "
+"usar (ex: \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Reproduz ou não um som de notificação para contatos desconectando-se da rede."
+msgid "Enable spell checker"
+msgstr "Habilitar verificador ortográfico"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Reproduzir um som de notificação para eventos."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
+"ortográfica."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Reproduzir um som de notificação para mensagens recebidas."
+msgid "Nick completed character"
+msgstr "Caractere de completamento de apelidos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Reproduzir um som de notificação para novas conversas."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caracteres para adicionar depois do apelido quando usar completamento de "
+"apelidos (tab) em bate-papo em grupo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Reproduzir um som de notificação para mensagens enviadas."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última conta escolhida ao entrar numa sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Caminho D-Bus da última conta escolhida ao entrar numa sala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Mostra uma notificação quando um contato estiver desconectado."
+msgid "Camera device"
+msgstr "Dispositivo da câmera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Mostra uma notificação quando um contato conectar."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositivo de câmera padrão para uso em chamadas de vídeo, por exemplo, /"
+"dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Mostra uma notificação quando receber uma nova mensagem mesmo se a janela de "
-"bate papo estiver aberta, mas não estiver com o foco."
+msgid "Camera position"
+msgstr "Posição da câmera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Mostra uma notificação quando receber uma nova mensagem."
+msgid "Position the camera preview should be during a call."
+msgstr "Posição de visualização da câmera que deve estar durante a chamada."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Mostra os créditos das contas na lista de contatos."
+msgid "Echo cancellation support"
+msgstr "Suporte para cancelamento de eco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Habilitar filtro de cancelamento de eco do Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Mostra os contatos que estão desconectados na lista de contatos."
+msgid "Show hint about closing the main window"
+msgstr "Mostra dica sobre como fechar a janela principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Mostra uma notificação quado estiver ausente ou ocupado."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
+"\" na barra do título."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Mostra os protocolos para contatos na lista de contatos."
+msgid "Empathy can publish the user's location"
+msgstr "O Empathy pode publicar a localização do usuário"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Mostra a lista de contatos nas salas de bate-papo."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Publica a localização do usuário para seus contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Mostra a lista de contatos no modo compacto."
+msgid "Empathy can use the network to guess the location"
+msgstr "O Empathy pode usar a rede para adivinhar a localização"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
-"\" na barra do título."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Usa a rede para adivinhar a localização."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Usa o tema em salas de bate-papo."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Usa a rede de celular para adivinhar a localização."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "O Empathy pode usar o GPS para adivinhar a localização"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Usa o GPS para adivinhar a localização."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "O Empathy deve reduzir a precisão da localização"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Qual critério usar quando ordenando a lista de contatos. Por padrão a "
-"ordenação é feita usando o nome do contato com o valor \"nome\". Um valor de "
-"\"estado\" ordenará a lista de contatos por estado."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Reduz a precisão de localização por razões de privacidade."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gerencia contas de mensagem e VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nenhum motivo foi especificado"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de Mensagem e VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "A alteração de estado foi solicitada"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Você cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "O outro participante cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Erro ao tentar transferir o arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "O outro participante não pode transferir o arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Motivo desconhecido"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Transferência de arquivo concluída, porém o arquivo estava corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Transferência de arquivo sem suporte pelo seu contato"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "O arquivo selecionado não é um arquivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "O arquivo selecionado é vazio"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
@@ -551,172 +605,141 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Tipo de soquete sem suporte"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nenhum motivo foi especificado"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "A alteração de estado foi solicitada"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Você cancelou a transferência do arquivo"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "O outro participante cancelou a transferência do arquivo"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Erro ao tentar transferir o arquivo"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "O outro participante não pode transferir o arquivo"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Motivo desconhecido"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O status está definido como desconectado"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Falha de autenticação"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de criptografia"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome já em uso"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificado não fornecido"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado não confiável"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificado expirado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificado não ativado"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certificado com nome de máquina incorreto"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificado com impressão digital incorreto"
 
 # self-signed  - Deixei como próprio
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado próprio"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Criptografia não disponível"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certificado inválido"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "A conexão foi recusada"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Não é possível estabelecer conexão"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "A conexão foi perdida"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Este recurso já está conectado ao servidor"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta já está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexão foi substituída por uma nova conexão usando os mesmos recursos"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "A conta já existe no servidor"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor está atualmente muito ocupado para lidar com a conexão"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente "
 "fraco"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -725,285 +748,279 @@ msgstr ""
 "certificado do servidor excede os limites impostos pela biblioteca de "
 "criptografia"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Seu software é muito antigo"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Pessoas por perto"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! japonês"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Bate-papo Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d segundo atrás"
 msgstr[1] "%d segundos atrás"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d semana atrás"
 msgstr[1] "%d semanas atrás"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Senha não encontrada"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "A senha da conta de MI para %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "A senha para a conferência \"%s\" na conta %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Todas as contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Senha"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Minhas contas web"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "A conta %s é editada através do %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "A conta %s não pode ser editada no Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Iniciar Minhas contas web"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Editar %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "C_onectar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta já existe no servidor"
 
 # Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Criar uma nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Cancelar"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta no %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nova conta"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exemplo:</b> MeuNomeExibido"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Se_nha:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avançado"
+msgid "Screen _Name:"
+msgstr "_Nome exibido:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exemplo:</b> MeuNomeExibido"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Se_nha:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Lembrar senha"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Lembrar senha"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Porta:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Lembrar senha"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nome exibido:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Qual é a sua senha do AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avançado"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Qual é o seu apelido do AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "What is your AIM password?"
+msgstr "Qual é a sua senha do AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exemplo:</b> nome de usuário"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Lembrar senha"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_D de login:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exemplo:</b> nome de usuário"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Qual é o seu ID de usuário GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Qual é a sua senha do GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exemplo:</b> 123456789"
 
 # Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "C_odificação de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Qual é o seu UIN do ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Qual é a sua senha do ICQ?"
 
@@ -1040,12 +1057,24 @@ msgstr "Opções"
 msgid "None"
 msgstr "Nenhum"
 
-# Changed from Og's "conjunto de caracteres because of little room.
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Rede"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Rede:"
+
+# Changed from Og's "conjunto de caracteres because of little room.
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Codificação de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1053,14 +1082,6 @@ msgstr ""
 "A maioria dos servidores de IRC não precisa de uma senha, por isso, se você "
 "não tiver certeza, não digite uma senha."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Rede"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Rede:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Apelido:"
@@ -1077,48 +1098,20 @@ msgstr "Mensagem de saída:"
 msgid "Real name:"
 msgstr "Nome verdadeiro:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Qual é o seu apelido do IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Qual rede IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exemplo:</b> usuário@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Examplo:</b> usuário@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Criptografia r_equerida (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorar erros de certificado SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Sobrescrever configurações do servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridade:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Qual é o seu apelido do IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Rec_urso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Qual é o seu nome de usuário do Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1130,211 +1123,235 @@ msgstr ""
 "Utilize <a href=\"http://www.facebook.com/username/\">nesta página</a> para "
 "escolher um nome de usuário para o Facebook se você não possuir um."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar criptografia SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Qual é a sua senha do Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Qual é o seu nome de usuário do Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Qual é o seu ID do Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Exemplo:</b> usuário@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Qual é a sua senha do Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Examplo:</b> usuário@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignorar erros de certificado SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridade:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Rec_urso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Criptografia r_equerida (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar criptografia SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Sobrescrever configurações do servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Qual é o seu ID do Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Qual é a sua senha do Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Qual é o seu ID do Jabber desejado?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Qual é a sua senha do Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Qual é a sua senha do Jabber desejada?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Qual é seu ID do Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Qual é a sua senha do Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Endereço de e-_mail:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Apeli_do:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Sobrenome:"
+
 # A mensagem original termina em espaço, mas suas análogas não.
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Primeiro nome:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nome _publicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID do _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sobrenome:"
+msgid "E-_mail address:"
+msgstr "Endereço de e-_mail:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nome _publicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exemplo:</b> usuario@meu.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Autenticação do nome do usuário:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descobrir Binding"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descobrir o servidor STUN automaticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar essa conta para chamar telefones e celulares"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar erros TLS"
+msgid "NAT Traversal Options"
+msgstr "Opções transversais de NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opções de Proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opções Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Opções de miscelânea"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Roteamento frouxo"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descobrir o servidor STUN automaticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opções de miscelânea"
+msgid "Discover Binding"
+msgstr "Descobrir Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opções transversais de NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opções Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Porta:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opções de Proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Autenticação do nome do usuário:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Roteamento frouxo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar essa conta para chamar telefones e celulares"
+msgid "Port:"
+msgstr "Porta:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Qual é a senha da sua conta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Qual é o seu ID de conexão do SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Nome de usuário:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Qual é a senha da sua conta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D do Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ignorar convites de conferências e bate-papo"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Local da l_ista da sala:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Qual é o seu ID do Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Qual é a sua senha do Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D do Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Local da l_ista da sala:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Não foi possível converter a imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Seu sistema não oferece suporte a nenhum dos formatos de imagem aceitos"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Não foi possível salvar a foto para o arquivo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Selecione sua imagem de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tirar uma foto..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nenhuma imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imagens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -1342,61 +1359,65 @@ msgstr "Todos os arquivos"
 msgid "Click to enlarge"
 msgstr "Clique para ampliar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Ocorreu um erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "O contato especificado não suporta chamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "O contato especificado está desconectado."
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "O contato especificado é inválido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Chamadas de emergência não são suportadas por este protocolo"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Você não possui créditos suficientes para efetuar esta chamada"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Falhou ao abrir bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Tópico sem suporte nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Você não está autorizado a alter o tópico"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" não é um identificador de contato válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpa todas as mensagens da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tópico>: define o tópico da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID da sala de bate-papo>: entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID da sala de bate-papo> Entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1404,23 +1425,23 @@ msgstr ""
 "/part [<ID sala de bate-papo>] [<motivo>]: abandonar a sala de bate-papo, "
 "por padrão a sala atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apelido>: altera o seu apelido no servidor atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensagem>: envia uma mensagem de AÇÃO para a conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1430,11 +1451,11 @@ msgstr ""
 "enviar uma mensagem iniciando com \"/\". Por exemplo: \"/say /join é "
 "utilizado para entrar em uma nova sala de bate-papo\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contato>: exibe informações sobre um contato"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1442,113 +1463,126 @@ msgstr ""
 "/help [<comando>]: mostra todos os comandos suportados. Se <comando> estiver "
 "definido, será exibido instruções de uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilização: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconhecido; veja /help para os comandos disponíveis"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "Créditos insuficientes para enviar mensagens"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Erro ao enviar a mensagem \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Erro ao enviar mensagem: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "créditos insuficientes. <a href='%s'>Voltar</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "incapaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "mensagem muito longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Erro enviando mensagem \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Erro ao enviar mensagem: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tópico definido por %s como: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sem sugestões)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
-msgstr "Inserir smiley"
+msgstr "Inserir carinha"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Sugestões de ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Falha ao receber os registros recentes"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1556,12 +1590,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulso por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulso"
@@ -1569,17 +1603,17 @@ msgstr "%s foi expulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi banido por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi banido"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s saiu da sala"
@@ -1589,108 +1623,108 @@ msgstr "%s saiu da sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entrou na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s é agora conhecido como %s"
+msgstr "%s agora chama-se %s"
 
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Deseja armazenar esta senha?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Repetir"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Senha errada; por favor, tente novamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala é protegida por uma senha:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Entrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Identificador inválido ou desconhecido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueio de contatos temporariamente indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Bloqueio de contatos indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Permissão negada"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Impossível bloquear o contato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Editar contatos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1700,466 +1734,371 @@ msgstr "Contatos _bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "_Remover"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar endereço do link"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Abrir _link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editar informações do contato"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informações pessoais"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Tem a certeza de que deseja bloquear \"%s\" impedindo-o de o contatar "
 "novamente?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Reportar este contato como abusivo"
 msgstr[1] "_Reportar estes contatos como abusivos"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir _depois"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Requisição de inscrição"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuário"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Sem grupo"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Amigos prediletos"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Você realmente deseja remover o grupo \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Removendo grupo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Você realmente deseja remover o contato \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Removendo contato"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Adicionar Contato..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Bloquear contato"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Bate-papo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Chamada de áudio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "Chamada de _vídeo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Conversas anteriores"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Enviar arquivo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Compartilhar minha área de trabalho"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favoritos"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mações"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Convidando você para esta sala"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "Conv_idar para sala de bate-papo"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir _depois"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Pesquisar contatos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pesquisar: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Adicionar Contato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nenhum contato encontrado"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Sua mensagem introduzindo-se:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Por favor, deixe-me ver quando você estiver online. Muito obrigado!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Selecionar contato..."
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefone:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Endereço de e-mail:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Site da web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Aniversário:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Última atividade:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Conectado a partir de:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Mensagem de ausência:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canais:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Código ISO do país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "�rea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "CEP:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Endereço:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Construção:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Andar:"
 
 # Evitar colisão com _Salvar
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nível de eficácia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Erro na vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Erro na horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Direção:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Taxa de subida:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Atualizado pela última vez em:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localização"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y em %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Salvar avatares"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Não foi possível salvar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Localização</b> em (data)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Apelido:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Informações do cliente"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalhes pessoais"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Nome completo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefone"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Endereço de e-mail"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Site da web"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Aniversário"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Última atividade:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Conectado a partir de:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Mensagem de ausência:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "trabalho"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "casa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "móvel"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voz"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "principal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "recado"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "temporário"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identificação:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Apelido:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localização</b> em (data)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Informação solicitada…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Informações do cliente"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2167,106 +2106,172 @@ msgstr ""
 "Selecione os grupos nos quais este contato aparecerá. Observe que você pode "
 "selecionar mais de um grupo ou nenhum grupo."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Adicionar grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "A seguinte identidade será bloqueada:"
 msgstr[1] "As seguintes identidades serão bloqueadas:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Não é possível bloquear a seguinte identidade:"
 msgstr[1] "Não é possível bloquear as seguintes identidades:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contatos agrupados"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Selecionar contato para agrupar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Visualização de novo contato"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Contatos selecionados na lista da esquerda serão conectados todos juntos."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editar informações do contato"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Selecionar a conta que será usada para fazer a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "CASA"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Bloquear contato"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Bate-papo"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Chamada de áudio"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Conversas anteriores"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Enviar arquivo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Compartilhar minha área de trabalho"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favoritos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts não está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Por favor, instale o pacote gnome-contacts para ter acesso aos detalhes do "
+"contato."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mações"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "Agr_upar contatos…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Convidando você para esta sala"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Conv_idar para sala de bate-papo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Adicionar Contato..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Apagar e _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Você realmente deseja remover o grupo \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Removendo grupo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Você realmente deseja remover o contato \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2275,7 +2280,11 @@ msgstr ""
 "Deseja realmente remover o contato agrupado \"%s\"? Note que isso irá "
 "remover todos os contatos que constituem este contato agrupado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Removendo contato"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2286,23 +2295,23 @@ msgstr[1] "Meta-contatos contendo %u contatos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Localização</b> em (data)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado a partir de um celular ou dispositivo móvel"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova rede"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Escolha uma rede de IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Reiniciar a lista de _redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Selecionar"
@@ -2315,250 +2324,252 @@ msgstr "novo servidor"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Contatos agrupados"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desagrupar..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Divide completamente os meta-contatos exibidos nos contatos que ele contém."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Agrupar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desagrupar meta-contato \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Tem a certeza de que deseja desagrupar estes contatos? Isto irá separar os "
-"contatos vinculados em contatos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desconectar"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversa em %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa com %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Chamada durou %s, encerrada às %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoje"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Qualquer hora"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Qualquer coisa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Chamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chamadas recebidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chamadas realizadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chamadas não atendidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "O que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Tem certeza que deseja deletar todos os registros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "_Limpar tudo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Deletar de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Carregando...</span>"
+msgid "_File"
+msgstr "Arquivo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Bate-papo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Deletar todo o histórico..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Bate-papo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "Arquivo"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "página 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ID do contato:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Carregando...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "O contato está desconectado"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ba_te-papo"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "O contato especificado é inválido ou desconhecido"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Este tipo de conversa não é suportado por este contato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "A funcionalidade solicitada não está implementada neste procotolo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Não foi possível iniciar uma conversa com este contato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Você foi banido deste canal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Este canal está cheio"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Você tem que ser convidado para entrar neste canal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Não é possível prosseguir enquanto estiver desconectado"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permissão negada"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Ocorreu um erro ao iniciar a conversa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Digite um contato ou um número de telefone:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nova conversa"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Enviar _vídeo"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "Ch_amar"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Chamada de áudio"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova chamada"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "A autenticação falhou na conta <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2595,12 +2606,8 @@ msgstr "Clique para fazer deste estado um favorito"
 msgid "Set status"
 msgstr "Definir estado"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Define sua presença e estado atual"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Mensagens personalizadas..."
 
@@ -2608,7 +2615,7 @@ msgstr "Mensagens personalizadas..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nova conta %s"
@@ -2618,20 +2625,20 @@ msgid "Find:"
 msgstr "Localizar:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Diferenciar _maiúsculas de minúsculas"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frase não encontrada"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Próxima"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Diferenciar _maiúsculas de minúsculas"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "Frase não encontrada"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2677,12 +2684,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensagens personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensagem editada às %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2763,34 +2770,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certificado da máquina: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "_Continuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Conexão não confiável"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexão não é confiável. Você quer continuar assim mesmo?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta escolha para conexões futuras"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalhes do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Não foi possível abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Espaço livre insuficiente para salvar o arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2799,7 +2810,7 @@ msgstr ""
 "É necessário %s de espaço livre para salvar este arquivo, mas apenas está "
 "disponível %s. Selecione outra localização."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Recebendo arquivo de %s"
@@ -2971,39 +2982,31 @@ msgstr "Ocidental"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "O contato selecionado não pode receber arquivos."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "O contato selecionado está desconectado."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nenhuma mensagem de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Mensageiro Instantâneo (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Não conectar ao iniciar"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Não mostrar a lista de contatos ou qualquer outro diálogo ao iniciar"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Erro ao contatar o gerenciador de conta"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3049,11 +3052,11 @@ msgstr ""
 "Empathy; se não, escreva para a Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Um cliente de mensagens instantâneas para o GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Luiz Guaraldo <software.livre@terra.com.br>\n"
@@ -3064,231 +3067,90 @@ msgstr ""
 "Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
 "Taylon Silmer <taylonsilva@gmail.com>\n"
 "Michel Recondo <michel@recondo.com.br>\n"
-"Jonh Wendell <wendell@bani.com.br>\n"
+"Jonh Wendell <jonh.wendell@gmail.com>\n"
 "Vladimir Melo <vmelo@gnome.org>\n"
 "André Gondim <andregondim@ubuntu.com>\n"
 "Henrique P. Machado <hpmachado@gnome.org>\n"
 "Felipe Borges <felipe10borges@gmail.com>\n"
 "Antonio Fernandes C. Neto <fernandesn@gnome.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Ocorreu um erro ao importar as contas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Ocorreu um erro ao analisar os detalhes da conta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Ocorreu um erro ao criar a conta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Ocorreu um erro."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A mensagem de erro foi: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Você pode voltar e tentar digitar os detalhes da sua conta novamente ou sair "
-"deste assistente e adicionar contas mais tarde pelo menu Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Houve um erro"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Qual tipo de conta de bate-papo você possui?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Você possui alguma outra conta que deseja configurar?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Digite os detalhes da sua conta"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Qual tipo de conta de bate-papo você deseja criar?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Você deseja criar outras contas de bate-papo?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Digite os detalhes para a nova conta"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Com o Empathy você pode bater papo com pessoas online por perto e com amigos "
-"e colegas que usam Google Talk, AIM, Windows Live e muitos outros programas "
-"de bate-papo. Com um microfone ou uma webcam você poderá também ter chamadas "
-"de áudio ou vídeo."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Você possui uma conta que você usa com outro programa?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Sim, importe os detalhes da minha conta de "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Sim, eu digitarei os detalhes da minha conta agora"
-
-# Tooltip.
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Não, eu desejo criar uma nova conta"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Não, eu só desejo ver pessoas online por perto por agora"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Selecione as contas que você deseja importar:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Sim"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Não, por agora basta"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"O Empathy pode automaticamente descobrir e conversar com as pessoas "
-"conectadas na mesma rede que você. Se você quiser utilizar este recurso, por "
-"favor, verifique se os detalhes abaixo estão corretos. Você pode facilmente "
-"alterar estes detalhes depois ou desabilitar este recurso usando o diálogo "
-"\"Contas\" "
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Editar->Contas"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Eu _não quero habilitar este recurso agora"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Você não está habilitado a conversar com pessoas conectadas na sua rede "
-"local pelo fato do telepathy-salut não estar instalado. Se você quiser "
-"habilitar este recurso, por favor, instale o pacote telepathy-salut e crie "
-"uma nova conta Pessoas por perto no diálogo de Contas"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "o telepathy-salut não está instalado"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistente de contas de mensagem e VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Bem-vindo ao Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importe suas contas existentes"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Por favor, insira seus detalhes pessoais"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existem modificações da sua conta %s que ainda não foram salvas."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Sua nova conta ainda não foi salva."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Nenhuma conexão de rede"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Status desconhecido"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta conta foi desabilitada porque ela depende de um backend muito antigo, "
+"que não é mais suportado. Por favor, instale o pacote telepathy-haze e "
+"reinicie sua sessão para efetuar a migração da conta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desabilitada"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Você está prestes a criar uma nova conta, o que descartará\n"
-"suas modificações. Você tem certeza que deseja prosseguir?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Editar os parâmetros de conexão"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Falha ao recuperar sua informação pessoal do servidor."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Conecte-se para editar sua informação pessoal."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Editar os parâmetros de conexão..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Você deseja remover %s do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Isso não removerá sua conta no servidor."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3297,39 +3159,43 @@ msgstr ""
 "suas modificações. Você tem certeza que deseja prosseguir?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Desabilitar"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Pular"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 "Você está prestes a fechar a janela, o que descartará\n"
-"suas modificações. Você tem certeza que deseja prosseguir?"
+"suas modificações. Tem certeza que deseja prosseguir?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Add…"
 msgstr "_Adicionar…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Carregando informações de conta"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nenhum protocolo instalado"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Carregando informações de conta"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3337,132 +3203,116 @@ msgstr ""
 "Para adicionar uma nova conta, é necessário primeiro instalar um backend "
 "para cada protocolo que você deseja usar."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Nenhum protocolo instalado"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Pessoas por perto"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Painel lateral"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Entrada de áudio"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Teclado"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalhes"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada de %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "O endereço IP como visto pela máquina"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O endereço IP como visto por um servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O endereço IP do par como visto pelo outro lado"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "O endereço IP de um servidor de retransmissão"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "O endereço IP do grupo de multicast"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalhes técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3471,8 +3321,8 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de áudio com suporte em "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3481,8 +3331,8 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de vídeo com suporte em "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3491,29 +3341,29 @@ msgstr ""
 "Não foi possível realizar uma conexão para %s. Você deve estar em uma rede "
 "que não permite conexões diretas."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Ocorreu uma falha de rede"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos de áudio necessários para esta chamada não estão instalados no "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos de vídeo necessários para esta chamada não estão instalados no "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3524,262 +3374,310 @@ msgstr ""
 "\"%s\">reporte este erro</a> e anexe os registros gerados na janela "
 "\"Depuração\" no menu Ajuda."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu uma falha no mecanismo de chamada"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Alcançado o fim do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Não foi possível realizar uma transmissão de áudio"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Não foi possível realizar uma transmissão de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�udio"
+msgid "_Call"
+msgstr "_Chamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec de decodificação:"
+msgid "_Microphone"
+msgstr "_Microfone"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "_Desabilitar câmera"
+msgid "_Camera"
+msgstr "_Câmera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Exibir o teclado"
+msgid "_Settings"
+msgstr "_Configuraçõess"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Codec de codificação:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Desligar"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Aj_uda"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Desligar a chamada atual"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Sumário"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Apresentação local:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Depuração"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizar-me"
+msgid "Swap camera"
+msgstr "Trocar a câmera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizar-me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Apresentação remota:"
+msgid "Maximise me"
+msgstr "Maximizar-me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar áudio"
+msgid "Disable camera"
+msgstr "_Desabilitar câmera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Enviar _vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Desligar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Mostrar teclado"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Desligar a chamada atual"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Chamada de vídeo"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Iniciar uma chamada de vídeo"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Iniciar uma chamada de áudio"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Trocar a câmera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Alternar transmissão de áudio"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Alternar transmissão de vídeo"
+msgid "Show dialpad"
+msgstr "Mostrar teclado"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "Desconhecido"
+msgid "Display the dialpad"
+msgstr "Exibir o teclado"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Enviar _vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Chamada de vídeo"
+msgid "Toggle video transmission"
+msgstr "Alternar transmissão de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Chamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar áudio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Câmera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sumário"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Alternar transmissão de áudio"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Depuração"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Codec de codificação:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Aj_uda"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Codec de decodificação:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Microfone"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Apresentação remota:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Configuraçõess"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Apresentação local:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Audio"
+msgstr "�udio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Fechar esta janela?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Ao fechar esta janela você sairá de %s. Você não receberá mais nenhuma "
+"mensagem até que entre novamente."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Ao fechar esta janela você sairá de 1 sala de bate-papo. Você não receberá "
+"mais nenhuma mensagem até que entre novamente."
+msgstr[1] ""
+"Ao fechar esta janela você sairá de %u salas de bate-papo. Você não receberá "
+"mais nenhuma mensagem até que entre novamente nelas."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Sair de %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Você não receberá mais nenhuma mensagem desta sala até que entre novamente."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Fechar a janela"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Sair da sala"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d não lida)"
 msgstr[1] "%s (%d não lidas)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u outro)"
 msgstr[1] "%s (e %u outros)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d não lido de outros)"
 msgstr[1] "%s (%d não lido de outros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d não lido de todos)"
 msgstr[1] "%s (%d não lido de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Enviando %d mensagem"
 msgstr[1] "Enviando %d mensagens"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Digitando uma mensagem."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpar"
+msgid "_Conversation"
+msgstr "_Conversa"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontato"
+msgid "C_lear"
+msgstr "_Limpar"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Inserir _smiley"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Marcar sala de bate-papo como _favorita"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Convidar _participante..."
+msgid "Notify for All Messages"
+msgstr "Notificar todas as mensagens"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover aba para a _esquerda"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contatos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover aba para a _direita"
+msgid "Invite _Participant…"
+msgstr "Convidar _participante..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar todas as mensagens"
+msgid "C_ontact"
+msgstr "C_ontato"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversa"
+msgid "_Tabs"
+msgstr "_Abas"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Destacar aba"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Marcar sala de bate-papo como _favorita"
+msgid "_Previous Tab"
+msgstr "Aba _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Próxima aba"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Aba _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Desfazer fechar aba"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contatos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover aba para a _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Abas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover aba para a _direita"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Desfazer fechar aba"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Destacar aba"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3793,100 +3691,100 @@ msgstr "Sala"
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Gerenciar salas favoritas"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Recebendo chamada de vídeo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Recebendo chamada"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s está chamando você via vídeo, você quer responder?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s está chamando você, você quer responder?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Recebendo chamada de %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "R_esponder"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder com vídeo"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Recebendo chamada de vídeo de %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Convite de sala"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para entrar em %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidando você para entrar em %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "E_ntrar"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s o convidou para entrar em %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Você foi convidado para entrar em %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Recebendo transferência de arquivo de %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Senha requerida"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s gostaria de ter permissão para ver quando vocês estiver online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3897,106 +3795,106 @@ msgstr ""
 
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s em %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recebendo \"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando \"%s\" para %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erro recebendo \"%s\" de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Erro recebendo arquivo"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erro enviando \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Erro enviando arquivo"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" recebido de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" enviado para %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Transferência de arquivo concluída"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Aguardando a resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verificando integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Fazendo hash de \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restando"
 
@@ -4008,7 +3906,11 @@ msgstr "Transferências de arquivo"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove transferências concluídas, canceladas e falhas da lista"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3918,198 @@ msgstr ""
 "Nenhuma conta para importar pôde ser localizada. Atualmente o Empathy só tem "
 "suporte a importar contas do Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Origem"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Forneça a senha"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Você precisa adicionar uma conta para ver seus contatos aqui."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Desculpe, mas contas de %s só podem ser usadas quando seu software %s for "
+"atualizado."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Atualizar software..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Fechar"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar conta"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Fechar"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recarregar %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recarregar os créditos da conta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recarregar..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contato"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Você precisa habilitar pelo menos uma conta para ver seus contatos aqui."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Você precisa habilitar a conta %s para ver seus contatos aqui."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contatos"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contatos no _mapa"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configurações das contas"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Créditos"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova conversa..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Procurar na _lista de contatos"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _chamada..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Entrar em _favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Procurar por contatos…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Gerenciar favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Transferências de arquivos"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamanho no_rmal"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Contatos _desconectados"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _chamada..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Exibir p_rotocolos"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamanho normal com _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Créditos"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contatos no _mapa"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "Cont_as"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contatos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referências"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Exibir p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Procurar na _lista de contatos"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por _status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "Cont_as"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamanho normal com _avatares"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contatos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamanho no_rmal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Tamanho _compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Transferências de arquivos"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "E_ntrar..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova conversa..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Contatos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Informação _pessoal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Entrar em _favoritos"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Procurar por contatos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Gerenciar favoritos"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Sala de bate-papo"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4122,27 @@ msgstr ""
 "Senha requerida: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sim"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Não"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Não é possível iniciar a listagem de salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Não foi possível parar a listagem de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Não foi possível carregar lista de salas"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Entrar na sala"
 
 # Tooltip, but imperative sentence is correct.
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
@@ -4218,8 +4152,13 @@ msgstr ""
 "Digite o nome da sala em que você deseja entrar aqui ou clique em uma sala "
 "ou mais na lista."
 
-# Tooltip, but imperative sentence is correct.
+# Evitar colisão com _Salvar
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sa_la:"
+
+# Tooltip, but imperative sentence is correct.
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4227,375 +4166,395 @@ msgstr ""
 "Digite o servidor que hospeda a sala, ou deixe o campo vazio caso a sala "
 "esteja no servidor da conta atual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Entrar na sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Não foi possível carregar lista de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de salas"
 
-# Evitar colisão com _Salvar
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nova conversa"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "O contato está conectado"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Um contato se conecta"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "O contato está desconectado"
+msgstr "Um contato se desconecta"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
-msgstr "Conta conectada"
+msgstr "Uma conta se conecta"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
-msgstr "Conta desconectada"
+msgstr "Uma conta se desconecta"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ó Romeu, Romeu, porque haverias de ser tu, Romeu?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Renega o teu pai e recusa o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou se não queres, jura-me que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "E deixarei de ser um Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Devo continuar a ouvi-la, ou posso falar agora?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta desconectou"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferências"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Mostrar _smileys como imagens"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Mostrar lista de contatos nas salas"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aparência"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamento"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Iniciar bate-papos em:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "T_ema do bate-papo:"
+msgid "new ta_bs"
+msgstr "nova _aba"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desabilitar notificações quando ausente ou _ocupado"
+msgid "new _windows"
+msgstr "nova _janela"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desabilitar sons quando _ausente ou ocupado"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Exibir eventos recebidos na área de notificação"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Conectar automati_camente ao iniciar "
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Cancelamento de eco ajuda a produzir o som de sua voz mais claro para a "
-"outra pessoa, mas pode causar problemas em alguns computadores. Se você ou a "
-"outra pessoa ouvir barulhos estranhos ou falhas durante as chamadas, tente "
-"desligar o cancelamento de eco e reiniciar a chamada."
+msgid "Log conversations"
+msgstr "Registro de conversas"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Habilitar notificações quando um contato conectar"
+msgid "Behavior"
+msgstr "Comportamento"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Habilitar notificações quando um contato desconectar"
+msgid "General"
+msgstr "Geral"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
+msgid "_Enable bubble notifications"
+msgstr "Ha_bilitar balões de notificação"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Habilitar verificação ortográfica para os idiomas:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desabilitar notificações quando ausente ou _ocupado"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Geral"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Nível de entrada:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Habilitar notificações quando um contato conectar"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Volume de entrada:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Habilitar notificações quando um contato desconectar"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notificações"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Fontes de localização:"
+msgid "_Enable sound notifications"
+msgstr "H_abilitar sons de notificação"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Registro de conversas"
+msgid "Disable sounds when _away or busy"
+msgstr "Desabilitar sons quando _ausente ou ocupado"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notificações"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproduzir sons para eventos"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sons"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacidade"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelamento de _echo para melhorar a qualidade da chamada"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Redução da precisão da localização significa que nada mais preciso do que a "
-"sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
-"precisão de 1 casa decimal."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Mostrar _smileys como imagens"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Mostrar lista de contatos nas salas"
+"Cancelamento de eco ajuda a produzir o som de sua voz mais claro para a "
+"outra pessoa, mas pode causar problemas em alguns computadores. Se você ou a "
+"outra pessoa ouvir barulhos estranhos ou falhas durante as chamadas, tente "
+"desligar o cancelamento de eco e reiniciar a chamada."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sons"
+msgid "_Publish location to my contacts"
+msgstr "_Publicar a localização para os meus contatos"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Verificação de ortografia"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"A lista de idiomas representa somente os idiomas para os quais você já "
-"possui dicionários instalados."
+"Redução da precisão da localização significa que nada mais preciso do que a "
+"sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
+"precisão de 1 casa decimal."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Temas"
+msgid "_Reduce location accuracy"
+msgstr "_Reduzir a precisão de localização"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variante:"
+msgid "Privacy"
+msgstr "Privacidade"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "Conectar automati_camente ao iniciar "
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Telefone _celular"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "Ha_bilitar balões de notificação"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rede (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "H_abilitar sons de notificação"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Fontes de localização:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wi-Fi)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"A lista de idiomas representa somente os idiomas para os quais você já "
+"possui dicionários instalados."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Abrir novos bate-papos em janelas separadas"
+msgid "Enable spell checking for languages:"
+msgstr "Habilitar verificação ortográfica para os idiomas:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Publicar a localização para os meus contatos"
+msgid "Spell Checking"
+msgstr "Verificação de ortografia"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "T_ema do bate-papo:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "_Reduzir a precisão de localização"
+msgid "Variant:"
+msgstr "Variante:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar o contato novamente"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Câmera desligada"
+msgid "Redial"
+msgstr "Rediscar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Câmera ligada"
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo desligado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desabilitar a câmera e parar o envio de vídeo"
+msgid "Video Preview"
+msgstr "Visualização de vídeo"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Habilitar a câmera e enviar vídeo"
+msgid "Video On"
+msgstr "Vídeo ligado"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Habilitar a câmera, mas não enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Chamar o contato novamente"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pré-visualizar"
+msgid "Camera Off"
+msgstr "Câmera desligada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Rediscar"
+msgid "Disable camera and stop sending video"
+msgstr "Desabilitar a câmera e parar o envio de vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pré-visualizar"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desligado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Habilitar a câmera, mas não enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo ligado"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Câmera ligada"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Visualização de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Habilitar a câmera e enviar vídeo"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Visualização do mapa de contatos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Link do pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Resposta do pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Dados grandes demais para um único post. Salve os logs em um arquivo."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar para o pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informações"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4603,168 +4562,349 @@ msgstr ""
 "O gerenciador de conexões selecionado não suporta a extensão de depuração "
 "remota."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Escolha um contato para convidar para a conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Não exibe nenhuma tela; faz todo o trabalho (ex: importa) e sai"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Não mostrar quaisquer diálogos exceto se apenas existirem contas \"Pessoas "
 "por perto\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Seleciona inicialmente uma conta fornecida (ex: gabble/jabber/"
 "por_exemplo_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id da conta>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Contas do Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Contas do Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Mostrar um determinado serviço"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Depurador Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Depurador do Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder com vídeo"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceitar"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou te ligar enquanto você estava em outra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Em espera"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mudo"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duração"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Seu saldo atual é %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Desculpe, você não possui créditos suficientes para esta chamada."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Voltar"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Diferenciar _maiúsculas/minúsculas"
 
-#~ msgid "Find Next"
-#~ msgstr "Procurar próximo"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Qual tipo de conta de bate-papo você possui?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adicionando uma nova conta"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Pessoas por perto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"O Empathy pode automaticamente descobrir e conversar com as pessoas "
+"conectadas na mesma rede que você. Se você quiser utilizar este recurso, por "
+"favor, verifique se os detalhes abaixo estão corretos."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Você pode alterar estes detalhes depois ou desabilitar este recurso através "
+"da opção <span style=\"italic\">Editar → Contas</span> na lista de contatos."
+
+#~ msgid "Call volume"
+#~ msgstr "Volume da chamada"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume de chamada, como uma porcentagem."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "O Empathy migrou os registros do butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Pergunta sobre migrar os registros do butterfly."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Tipo de soquete sem suporte"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Minhas contas web"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A conta %s é editada através do %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "A conta %s não pode ser editada no Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Iniciar Minhas contas web"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editar %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Cancelar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informações pessoais"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Sem grupo"
+
+#~ msgid "Favorite People"
+#~ msgstr "Amigos prediletos"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Select a contact"
+#~ msgstr "Selecionar contato..."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Contatos agrupados"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Selecionar contato para agrupar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Visualização de novo contato"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Contatos selecionados na lista da esquerda serão conectados todos juntos."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "Agr_upar contatos…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Contatos agrupados"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desagrupar..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Divide completamente os meta-contatos exibidos nos contatos que ele "
+#~ "contém."
+
+#~ msgid "_Link"
+#~ msgstr "_Agrupar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desagrupar meta-contato \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Tem a certeza de que deseja desagrupar estes contatos? Isto irá separar "
+#~ "os contatos vinculados em contatos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desconectar"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ID do contato:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ba_te-papo"
+
+#~ msgid "Send _Video"
+#~ msgstr "Enviar _vídeo"
+
+#~ msgid "C_all"
+#~ msgstr "Ch_amar"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Define sua presença e estado atual"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "O contato selecionado não pode receber arquivos."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "O contato selecionado está desconectado."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Ocorreu um erro ao importar as contas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Ocorreu um erro ao analisar os detalhes da conta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Ocorreu um erro ao criar a conta."
+
+#~ msgid "There was an error."
+#~ msgstr "Ocorreu um erro."
 
-#~ msgid "Find Previous"
-#~ msgstr "Procurar para trás"
+#~ msgid "The error message was: %s"
+#~ msgstr "A mensagem de erro foi: %s"
 
-#~ msgid "Show and edit accounts"
-#~ msgstr "Mostrar e editar contas"
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Você pode voltar e tentar digitar os detalhes da sua conta novamente ou "
+#~ "sair deste assistente e adicionar contas mais tarde pelo menu Editar."
 
-#~ msgid "Call with %d participants"
-#~ msgstr "Chamada com %d participantes"
+#~ msgid "An error occurred"
+#~ msgstr "Houve um erro"
 
-#~ msgid "All"
-#~ msgstr "Todos"
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Você possui alguma outra conta que deseja configurar?"
 
-#~ msgid "_Enabled"
-#~ msgstr "_Habilitado"
+#~ msgid "Enter your account details"
+#~ msgstr "Digite os detalhes da sua conta"
 
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Qual tipo de conta de bate-papo você deseja criar?"
 
-#~ msgid "Conversations"
-#~ msgstr "Conversas"
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Você deseja criar outras contas de bate-papo?"
 
-#~ msgid "Previous Conversations"
-#~ msgstr "Conversas anteriores"
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Digite os detalhes para a nova conta"
 
-#~ msgid "_For:"
-#~ msgstr "_Por:"
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Com o Empathy você pode bater papo com pessoas online por perto e com "
+#~ "amigos e colegas que usam Google Talk, AIM, Windows Live e muitos outros "
+#~ "programas de bate-papo. Com um microfone ou uma webcam você poderá também "
+#~ "ter chamadas de áudio ou vídeo."
 
-#~ msgid "Enter Custom Message"
-#~ msgstr "Digite a mensagem personalizada"
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Você possui uma conta que você usa com outro programa?"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Salvar _nova mensagem de status"
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sim, importe os detalhes da minha conta de "
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Salvar mensagens de status"
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sim, eu digitarei os detalhes da minha conta agora"
diff --git a/po/ru.po b/po/ru.po
index 58424a1a3..d2be513a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy trunk\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2012-01-07 20:04+0300\n"
+"POT-Creation-Date: 2012-03-06 15:16+0000\n"
+"PO-Revision-Date: 2012-03-07 18:21+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,430 +25,454 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Общайте�ь в Google Talk, Facebook, MSN и во многих других �лужбах"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Клиент обмена мгновенными �ообщени�ми"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Программа обмена �ообщени�ми Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Клиент обмена мгновенными �ообщени�ми"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Общайте�ь в Google Talk, Facebook, MSN и во многих других �лужбах"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Учётные запи�и обмена �ообщени�ми и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление учётными запи��ми дл� обмена �ообщени�ми и VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "В�егда открывать новую бе�еду в новом окне."
+msgid "Connection managers should be used"
+msgstr "И�пользуемые ди�петчеры �оединений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Камера"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или переподключени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Положение камеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "При�оедин�ть�� при запу�ке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� автодополнение п�евдонимов по клавише Tab."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Тема окна бе�еды"
+msgid "Empathy should auto-away when idle"
+msgstr "У�танавливать �тату� «от�ут�твует» при бездей�твии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Вариант тема дл� окна бе�еды"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при бездей�твии пользовател�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Спи�ок �зыков, и�пользуемых при проверке орфографии, разделённых зап�тыми (например «en, fr, ru»)."
+msgid "Empathy default download folder"
+msgstr "Папка Empathy дл� загрузки файлов"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Компактный �пи�ок �обе�едников"
+msgid "The default folder to save file transfers in."
+msgstr "Каталог по умолчанию дл� �охранени� при�ланных файлов."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "И�пользуемые ди�петчеры �оединений"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Магиче�кое чи�ло, и�пользуемое дл� проверки того, нужно ли запу�тить задачи по очи�тке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Критерий упор�дочивани� �пи�ка �обе�едников"
+msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
+msgstr "empathy-sanity-cleaning.c и�пользует �то чи�ло дл� проверки, нужно ли запу�тить задачи по очи�тке. Пользователи не должны измен�ть вручную значение �того ключа."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к комнате."
+msgid "Show offline contacts"
+msgstr "Показывать �обе�едников не в �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Камера, и�пользуема� по умолчанию дл� видеовызовов, напр. /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Показывать ли �обе�едников не в �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Каталог, и�пользуемый дл� выбора изображений аватаров"
+msgid "Show avatars"
+msgstr "Показывать аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Выключить в�плывающие уведомлени� в �о�то�нии «от�ут�твует»"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Показывать ли аватары �обе�едников в �пи�ке �обе�едников и окнах бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Выключить звуки в �о�то�нии «от�ут�твует»"
+msgid "Show protocols"
+msgstr "Показывать протоколы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Показывать ли протоколы дл� �обе�едников в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, показывать их непо�ред�твенно пользователю."
+msgid "Show Balance in contact list"
+msgstr "Показывать балан� в �пи�ке �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Поддержка подавлени� �ха"
+msgid "Whether to show account balances in the contact list."
+msgstr "Показывать ли балан�ы учётных запи�ей в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy может публиковать ме�тоположение пользовател�"
+msgid "Compact contact list"
+msgstr "Компактный �пи�ок �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy может и�пользовать GPS дл� определени� ме�тоположени�"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Показывать ли компактный �пи�ок �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy может и�пользовать �отовую �еть дл� определени� ме�тоположени�"
+msgid "Hide main window"
+msgstr "Скрывать главное окно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy может и�пользовать �еть дл� определени� ме�тоположени�"
+msgid "Hide the main window."
+msgstr "Скрывать главное окно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Папка Empathy дл� загрузки файлов"
+msgid "Default directory to select an avatar image from"
+msgstr "Каталог, и�пользуемый дл� выбора изображений аватаров"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "У�танавливать �тату� «от�ут�твует» при бездей�твии"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "По�ледний каталог, из которого выбирали�ь изображени� аватаров."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "При�оедин�ть�� при запу�ке"
+msgid "Open new chats in separate windows"
+msgstr "Открывать новые бе�еды в новом окне"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy должен �нижать точно�ть ме�тоположени�"
+msgid "Always open a separate chat window for new chats."
+msgstr "В�егда открывать новую бе�еду в новом окне."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy должен и�пользовать аватар контакта как значок окна � бе�едой"
+msgid "Display incoming events in the status area"
+msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Включить ин�трументы разработчика WebKit"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, показывать их непо�ред�твенно пользователю."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Включить в�плывающие уведомлени� о новых �ообщени�х"
+msgid "The position for the chat window side pane"
+msgstr "Положение боковой панели окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Включить проверку орфографии"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Положение боковой панели окна бе�еды (в пик�елах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Скрывать главное окно"
+msgid "Show contact groups"
+msgstr "Показывать группы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Скрывать главное окно."
+msgid "Whether to show groups in the contact list."
+msgstr "Показывать ли группы в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "По�ледн�� учётна� запи�ь, выбранна� в диалоге при�оединени� к комнате."
+msgid "Contact list sort criterion"
+msgstr "Критерий упор�дочивани� �пи�ка �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Символ автодополнени� п�евдонима"
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Критерий упор�дочивани� �пи�ка �обе�едников. По умолчанию упор�дочивает�� по �тату�у («state»); «name» — упор�дочивать по имени �обе�едника."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Открывать новые бе�еды в новом окне"
+msgid "Use notification sounds"
+msgstr "И�пользовать звуки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Путь к и�пользуемой теме Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Во�производить ли звук дл� уведомлени� о �обыти�х."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium."
+msgid "Disable sounds when away"
+msgstr "Выключить звуки в �о�то�нии «от�ут�твует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Во�производить ли звук при получении �ообщени�"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Во�производить ли звук при начале бе�еды"
+msgid "Play a sound for incoming messages"
+msgstr "Во�производить ли звук при получении �ообщени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Во�производить ли звук при отправке �ообщени�"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Во�производить ли звук дл� уведомлени� о вход�щих �ообщени�х."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Во�производить ли звук при входе контакта в �еть"
+msgid "Play a sound for outgoing messages"
+msgstr "Во�производить ли звук при отправке �ообщени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Во�производить ли звук при выходе контакта из �ети"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Во�производить ли звук дл� уведомлени� об и�ход�щих �ообщени�х."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Во�производить звук при входе в �еть"
+msgid "Play a sound for new conversations"
+msgstr "Во�производить ли звук при начале бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Во�производить звук при выходе из �ети"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Во�производить ли звук дл� уведомлени� о начале новой бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Показывать в�плывающие уведомлени�, е�ли бе�еда находит�� не в фоку�е"
+msgid "Play a sound when a contact logs in"
+msgstr "Во�производить ли звук при входе контакта в �еть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Показывать в�плывающие уведомлени�, когда по�вл�ет�� �обе�едник"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Во�производить ли звук дл� уведомлени� о входе �обе�едников в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Показывать в�плывающие уведомлени�, когда �обе�едник уходит"
+msgid "Play a sound when a contact logs out"
+msgstr "Во�производить ли звук при выходе контакта из �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Предварительный про�мотр положени� камеры должен выполн�ть�� в течение вызова."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Во�производить ли звук дл� уведомлени� о выходе �обе�едников из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Показывать балан� в �пи�ке �обе�едников"
+msgid "Play a sound when we log in"
+msgstr "Во�производить звук при входе в �еть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Показывать аватары"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Во�производить ли звук при входе в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Показывать �пи�ок �обе�едников в комнатах"
+msgid "Play a sound when we log out"
+msgstr "Во�производить звук при выходе из �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Показывать под�казку о закрытии главного окна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Во�производить ли звук при выходе из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Показывать от�ут�твующих �обе�едников"
+msgid "Enable popup notifications for new messages"
+msgstr "Включить в�плывающие уведомлени� о новых �ообщени�х"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Показывать протоколы"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Показывать ли в�плывающее уведомление при получении нового �ообщени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Языки дл� проверки орфографии"
+msgid "Disable popup notifications when away"
+msgstr "Выключить в�плывающие уведомлени� в �о�то�нии «от�ут�твует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Каталог по умолчанию дл� �охранени� при�ланных файлов."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледний каталог, из которого выбирали�ь изображени� аватаров."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Показывать в�плывающие уведомлени�, е�ли бе�еда находит�� не в фоку�е"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Положение боковой панели окна бе�еды"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Показывать ли в�плывающее уведомление о получении нового �ообщени�, когда бе�еда уже ведёт��, но не находит�� в фоку�е."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Положение боковой панели окна бе�еды (в пик�елах)."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Показывать в�плывающие уведомлени�, когда по�вл�ет�� �обе�едник"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Эта тема и�пользует�� дл� отображени� диалога в окне бе�еды."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Вариант темы, и�пользуемый дл� отображени� бе�ед."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Показывать в�плывающие уведомлени�, когда �обе�едник уходит"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "И�пользовать графиче�кие улыбки"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "И�пользовать звуки"
+msgid "Use graphical smileys"
+msgstr "И�пользовать графиче�кие улыбки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "И�пользовать тему дл� бе�ед"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие изображени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Может ли Empathy публиковать ме�тоположение пользовател� дл� его �обе�едников."
+msgid "Show contact list in rooms"
+msgstr "Показывать �пи�ок �обе�едников в комнатах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Может ли Empathy и�пользовать GPS дл� определени� ме�тоположени�."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Показывать ли �пи�ок �обе�едников в комнатах."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Может ли Empathy и�пользовать �отовую �еть дл� определени� ме�тоположени�."
+msgid "Chat window theme"
+msgstr "Тема окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Может ли Empathy и�пользовать �еть дл� определени� ме�тоположени�."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Эта тема и�пользует�� дл� отображени� диалога в окне бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
+msgid "Chat window theme variant"
+msgstr "Вариант тема дл� окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при бездей�твии пользовател�."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Вариант темы, и�пользуемый дл� отображени� бе�ед."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам приватно�ти."
+msgid "Path of the Adium theme to use"
+msgstr "Путь к и�пользуемой теме Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "И�пользовать ли аватар �обе�едника в каче�тве значка окна бе�еды."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Должны ли быть включены ин�трументы разработчика WebKit, например Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Включить ин�трументы разработчика WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или переподключени�."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Должны ли быть включены ин�трументы разработчика WebKit, например Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Провер�ть ли введённые �лова из �пи�ка �зыков дл� проверки орфографии."
+msgid "Inform other users when you are typing to them"
+msgstr "Уведомл�ть пользователей о наборе �ообщений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие изображени�."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "По�ылать ли уведомлени� о наборе �ообщений. �е и�пользует�� при �тату�е «Отошёл»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Включить ли фильтр подавлени� �ха Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "И�пользовать тему дл� бе�ед"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Во�производить ли звук дл� уведомлени� о входе �обе�едников в �еть."
+msgid "Whether to use the theme for chat rooms."
+msgstr "И�пользовать ли темы дл� комнат."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Во�производить ли звук дл� уведомлени� о выходе �обе�едников из �ети."
+msgid "Spell checking languages"
+msgstr "Языки дл� проверки орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Во�производить ли звук дл� уведомлени� о �обыти�х."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Спи�ок �зыков, и�пользуемых при проверке орфографии, разделённых зап�тыми (например «en, fr, ru»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Во�производить ли звук дл� уведомлени� о вход�щих �ообщени�х."
+msgid "Enable spell checker"
+msgstr "Включить проверку орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Во�производить ли звук дл� уведомлени� о начале новой бе�еды."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Провер�ть ли введённые �лова из �пи�ка �зыков дл� проверки орфографии."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Во�производить ли звук дл� уведомлени� об и�ход�щих �ообщени�х."
+msgid "Nick completed character"
+msgstr "Символ автодополнени� п�евдонима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Во�производить ли звук при входе в �еть."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� автодополнение п�евдонимов по клавише Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Во�производить ли звук при выходе из �ети."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy должен и�пользовать аватар контакта как значок окна � бе�едой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "И�пользовать ли аватар �обе�едника в каче�тве значка окна бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
+msgid "Last account selected in Join Room dialog"
+msgstr "По�ледн�� учётна� запи�ь, выбранна� в диалоге при�оединени� к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Показывать ли в�плывающее уведомление о получении нового �ообщени�, когда бе�еда уже ведёт��, но не находит�� в фоку�е."
+msgid "Camera device"
+msgstr "Камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Показывать ли в�плывающее уведомление при получении нового �ообщени�."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Камера, и�пользуема� по умолчанию дл� видеовызовов, напр. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Показывать ли балан�ы учётных запи�ей в �пи�ке �обе�едников."
+msgid "Camera position"
+msgstr "Положение камеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Показывать ли аватары �обе�едников в �пи�ке �обе�едников и окнах бе�еды."
+msgid "Position the camera preview should be during a call."
+msgstr "Предварительный про�мотр положени� камеры должен выполн�ть�� в течение вызова."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Показывать ли �обе�едников не в �ети."
+msgid "Echo cancellation support"
+msgstr "Поддержка подавлени� �ха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Включить ли фильтр подавлени� �ха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Показывать ли протоколы дл� �обе�едников в �пи�ке �обе�едников."
+msgid "Show hint about closing the main window"
+msgstr "Показывать под�казку о закрытии главного окна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Показывать ли �пи�ок �обе�едников в комнатах."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Показывать ли диалоговое окно при закрытии главного окна � помощью кнопки «x» в �троке заголовка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Показывать ли компактный �пи�ок �обе�едников."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy может публиковать ме�тоположение пользовател�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Показывать ли диалоговое окно при закрытии главного окна � помощью кнопки «x» в �троке заголовка."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Может ли Empathy публиковать ме�тоположение пользовател� дл� его �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "И�пользовать ли темы дл� комнат."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy может и�пользовать �еть дл� определени� ме�тоположени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Критерий упор�дочивани� �пи�ка �обе�едников. По умолчанию упор�дочивает�� по имени �обе�едника — «name». При значении «state» �пи�ок будет упор�дочен по �тату�у."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Может ли Empathy и�пользовать �еть дл� определени� ме�тоположени�."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление учётными запи��ми дл� обмена �ообщени�ми и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy может и�пользовать �отовую �еть дл� определени� ме�тоположени�"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Учётные запи�и обмена �ообщени�ми и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Может ли Empathy и�пользовать �отовую �еть дл� определени� ме�тоположени�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy может и�пользовать GPS дл� определени� ме�тоположени�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Может ли Empathy и�пользовать GPS дл� определени� ме�тоположени�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy должен �нижать точно�ть ме�тоположени�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам приватно�ти."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -475,7 +499,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Собе�едник не может передавать файлы"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�еизве�тна� причина"
 
@@ -496,7 +520,7 @@ msgid "The selected file is empty"
 msgstr "Выбранный файл пу�т"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущенный вызов от %s"
@@ -512,170 +536,174 @@ msgstr "Разговор � %s"
 msgid "Call from %s"
 msgstr "Вызов от %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "В �ети"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "�е бе�покоить"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "От�ут�твует"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидимо�ть"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "�е в �ети"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "У�тановлен �тату� «не в �ети»"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Ошибка �ети"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�утентификаци� не удала�ь"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Ошибка шифровани�"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Им� уже зан�то"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертификат недо�тупен"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификат не �вл�ет�� доверенным"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификат у�тарел"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Имена узлов �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечатки �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификат подпи�ан �амо�то�тельно"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Ошибка �ертификата"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифрование недо�тупно"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "�еверный �ертификат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Запро� на подключение отклонён"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е удало�ь у�тановить �оединение"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Соединение разорвано"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Этот ре�ур� уже подключён к �ерверу"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Эта учётна� запи�ь уже подключена к �ерверу"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Подключение было замещено новым подключение � �тим же ре�ур�ом"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "В на�то�щий момент �ервер �лишком загружен, чтобы обработать подключение."
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификат и�пользует небезопа�ный алгоритм шифра или криптографиче�ки �лаб"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Длина �ертификата �ервера или глубина цепочки �ертификатов �ервера превышает предел, у�тановленный криптографиче�кой библиотекой"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Слишком �тара� вер�и� приложени�"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Внутренн�� ошибка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Люди поблизо�ти"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Япони�"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Бе�еда Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -683,7 +711,7 @@ msgstr[0] "%d �екунду назад"
 msgstr[1] "%d �екунды назад"
 msgstr[2] "%d �екунд назад"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -691,7 +719,7 @@ msgstr[0] "%d минуту назад"
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -699,7 +727,7 @@ msgstr[0] "%d ча� назад"
 msgstr[1] "%d ча�а назад"
 msgstr[2] "%d ча�ов назад"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -707,7 +735,7 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дн� назад"
 msgstr[2] "%d дней назад"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -715,7 +743,7 @@ msgstr[0] "%d неделю назад"
 msgstr[1] "%d недели назад"
 msgstr[2] "%d недель назад"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -723,16 +751,16 @@ msgstr[0] "%d ме��ц назад"
 msgstr[1] "%d ме��ца назад"
 msgstr[2] "%d ме��цев назад"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в будущем"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "В�е учётные запи�и"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Учётна� запи�ь"
 
@@ -750,30 +778,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Им� пользовател�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "П_рименить"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Войти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Эта учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Создать новую учётную запи�ь на �ервере"
 
@@ -782,137 +810,137 @@ msgstr "Создать новую учётную запиÑ�ÑŒ на Ñ�ерверÐ
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Учётна� запи�ь %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ова� учётна� запи�ь"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Дополнительно"
+msgid "Screen _Name:"
+msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомнить пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "П_орт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомнить пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Им�:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Какой у ва� пароль AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Дополнительно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Какое у ва� им� пользовател� AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "П_орт:"
+msgid "What is your AIM password?"
+msgstr "Какой у ва� пароль AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> им�_пользовател�"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Идентификатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> им�_пользовател�"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Какой у ва� ID пользовател� GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Какой у ва� пароль GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Кодировка:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Какой у ва� ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Какой у ва� пароль ICQ?"
 
@@ -949,21 +977,25 @@ msgstr "Options"
 msgid "None"
 msgstr "От�ут�твует"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сеть"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Кодировка:"
+msgid "Network:"
+msgstr "Сеть:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Большин�тво �ерверов IRC не требует парол�, е�ли вы не уверены, то не вводите пароль."
+msgid "Character set:"
+msgstr "Кодировка:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сеть"
+msgid "Servers"
+msgstr "Серверы"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сеть:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Большин�тво �ерверов IRC не требует парол�, е�ли вы не уверены, то не вводите пароль."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -981,48 +1013,20 @@ msgstr "Сообщение при выходе:"
 msgid "Real name:"
 msgstr "�а�то�щее им�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Какой у ва� п�евдоним в IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Кака� �еть IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> пользователь@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> пользователь@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Требует�� шифров_ание (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Игнорировать ошибки �ертификатов SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Замещать на�тройки �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "При_оритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Какой у ва� п�евдоним в IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ре_�ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Какое у ва� им� пользовател� Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1032,64 +1036,92 @@ msgstr ""
 "Е�ли ваш адре� facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
 "И�пользуйте <a href=\"http://www.facebook.com/username/\">�ту �траницу</a> дл� выбора имени пользовател� Facebook, е�ли у ва� его ещё нет."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "И�пользовать �тарое _шифрование (SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Какой у ва� пароль Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Какое у ва� им� пользовател� Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Какой у ва� Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> пользователь@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Какой у ва� пароль Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> пользователь@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Игнорировать ошибки �ертификатов SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "При_оритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ре_�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Требует�� шифров_ание (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "И�пользовать �тарое _шифрование (SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Замещать на�тройки �ервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Какой у ва� Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Какой у ва� пароль Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Какой Jabber ID вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Какой у ва� пароль Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Какой пароль Jabber вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Какой у ва� Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Какой у ва� пароль Windows Live?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "_П�евдоним:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "�_дре� �л. почты:"
+msgid "_Last Name:"
+msgstr "_Фамили�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "_П�евдоним:"
+msgid "_First Name:"
+msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
+msgid "_Published Name:"
 msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
@@ -1097,114 +1129,110 @@ msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Фамили�:"
+msgid "E-_mail address:"
+msgstr "�_дре� �л. почты:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
 msgstr "_Им�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Им� пользовател� дл� аутентификации:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Обнаруживать �оединени�"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�втоматиче�кий пои�к �ервера STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "И�пользовать �ту учётную запи�ь дл� звонков на _обычные и мобильные телефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Игнорировать ошибки TLS"
+msgid "NAT Traversal Options"
+msgstr "Параметры NAT Traversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Интервал (в �екундах)"
+msgid "Proxy Options"
+msgstr "Параметры прок�и"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Параметры Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Различные параметры"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Свободна� маршрутизаци�"
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизм:"
+msgid "Discover the STUN server automatically"
+msgstr "�втоматиче�кий пои�к �ервера STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Различные параметры"
+msgid "Discover Binding"
+msgstr "Обнаруживать �оединени�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Параметры NAT Traversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Параметры Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Параметры прок�и"
+msgid "Interval (seconds)"
+msgstr "Интервал (в �екундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Им� пользовател� дл� аутентификации:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Loose Routing"
+msgstr "Свободна� маршрутизаци�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Игнорировать ошибки TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "И�пользовать �ту учётную запи�ь дл� звонков на _обычные и мобильные телефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Какой у ва� пароль учётной запи�и SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какой у ва� ID входа дл� SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Им�:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Какой у ва� пароль учётной запи�и SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Игнорировать приглашени� к бе�едам и конференци�м"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локаль �пи�ка бе�ед:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Какой у ва�  Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Какой у ва� пароль Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локаль �пи�ка бе�ед:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1242,213 +1270,219 @@ msgstr "В�е файлы"
 msgid "Click to enlarge"
 msgstr "Щёлкните дл� увеличени�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Во врем� вызова произошла ошибка"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Указанный контакт не поддерживает звонки"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Указанный �обе�едник не находит�� в �ети"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Указанный �обе�едник не �вл�ет�� допу�тимым"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Срочные телефонные звонки не поддерживают�� �тим протоколом"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "�едо�таточно �ред�тв, чтобы �делать �тот звонок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�е удало�ь открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "В �той бе�еде темы не поддерживают��"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не можете мен�ть тему"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» не �вл�ет�� допу�тимым идентификатором контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очи�тить в�е �ообщени� в текущей бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: у�тановить тему текущей бе�еды"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID контакта> [<�ообщение>]: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID контакта> <�ообщение>: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <п�евдоним>: изменить п�евдоним на текущем �ервере"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <�ообщение>: отправить �ообщение о ДЕЙСТВИИ"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <�ообщение>: отправить <�ообщение> в текущей бе�еде. И�пользует�� дл� отправки �ообщени�, начинающего�� � «/». �апример: «/say /join и�пользует�� дл� входа в новую комнату»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID контакта>: показать информацию о контакте"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<команда>]: показать в�е поддерживаемые команды. Е�ли <команда> определена, показать её и�пользование."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "И�пользование: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�еизве�тна� команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "�еизве�тна� команда; дл� в�ех до�тупных команд �м. /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Ошибка при отправке �ообщени� «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ошибка при отправке �ообщени�: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�. <a href='%s'>Пополнить</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не поддерживает��"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "не в �ети"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "неверный �обе�едник"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "отказано"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "�лишком длинное �ообщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "�та возможно�ть не �анкционирована"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Пользователь %s у�тановил тему: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Тема не у�тановлена"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(�ет предположений)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добавить «%s» в �ловарь"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавить «%s» в �ловарь «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "В�тавить улыбку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "От_править"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Варианты правопи�ани�"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�е удало�ь получить по�ледние журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s отключил��"
@@ -1456,12 +1490,12 @@ msgstr "%s отключил��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s выгнал %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s выгнали"
@@ -1469,17 +1503,17 @@ msgstr "%s выгнали"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s забанил %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s забанили"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинул бе�еду"
@@ -1489,17 +1523,17 @@ msgstr "%s покинул бе�еду"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s при�оединил�� к бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь изве�тен как %s"
@@ -1507,58 +1541,58 @@ msgstr "%s теперь изве�тен как %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279
+#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "От�оединён"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Хотите запомнить �тот пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е �ейча�"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Повторить"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "�еправильный пароль. Попробуйте �нова:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Эта комната защищена паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Войти"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Соединён"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Бе�еда"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,10 +1624,10 @@ msgstr "Изменить заблокированных �обе�едников
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Учётна� запи�ь:"
 
@@ -1603,7 +1637,7 @@ msgstr "Заблокированные �обе�едники"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Удалить"
@@ -1626,33 +1660,29 @@ msgstr "_Открыть ��ылку"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Лична� информаци�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�овый �обе�едник"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокировать %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Уверены, что хотите заблокировать «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Заблокировать"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1661,17 +1691,17 @@ msgstr[1] "_Пожаловать�� на �тих �обе�едников"
 msgstr[2] "_Пожаловать�� на �тих �обе�едников"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Решить _позже"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запро� на подпи�ку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Заблокировать пользовател�"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Решить _позже"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1826,7 +1856,7 @@ msgstr "Вы�ота:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�тоположение"
 
@@ -1843,15 +1873,25 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e %b %Y в %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сохранить аватар"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�еудало�ь �охранить аватар"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Информаци� о пользователе"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Информаци� о �обе�еднике"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Полное им�:"
@@ -1917,68 +1957,63 @@ msgstr "почтовый"
 msgid "parcel"
 msgstr "по�ылка"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ме�тоположение</b> от (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Идентификатор:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�евдоним:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Информаци� о клиенте"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Программа-клиент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ме�тоположение</b> от (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Информаци� о �обе�еднике"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Информаци� запрошена..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Идентификатор:"
+msgid "Client Information"
+msgstr "Информаци� о клиенте"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Информаци� запрошена..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "Операционна� �и�тема:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�и�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Программа-клиент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Группы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "Выберите группы, в которых должен по�вить�� �обе�едник. Можно выбрать больше одной группы или не выбирать вообще."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добавить группу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Группа"
 
@@ -2000,165 +2035,149 @@ msgstr[2] "Следующих �обе�едников нельз� заблок
 msgid "Edit Contact Information"
 msgstr "Редактировать информацию о �обе�еднике"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Объединённые контакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Выбрать контакты дл� �в�зи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Предпро�мотр нового �обе�едника"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Контакты, выбранные в �пи�ке �лева, будут объединены."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберите учётную запи�ь дл� вызова"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Вызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ДОМ�Ш�ИЙ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Заблокировать �обе�едника"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Разговор"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS:"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удиовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Предыдущие _бе�еды"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Предо�тавить до�туп к моему рабочему �толу"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Избранный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не у�тановлен"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Чтобы получить до�туп к �ведени�м о пользовател�х, у�тановите gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Информ_аци�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Правка"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Объединить контакты…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Приглашение в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Пригла�ить в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Добавить �обе�едника…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Удалить и _заблокировать"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вы хотите удалить группу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Удаление группы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Дей�твительно хотите удалить �обе�едника «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Дей�твительно удалить �в�занный контакт «%s»? Это приведёт к удалению в�ех контактов, которые �вл�ют�� ча�тью �того �в�занного контакта."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Удаление �обе�едника"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2170,23 +2189,23 @@ msgstr[2] "Св�занные контакты, �одержащие %u конт
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ме�тоположение</b> от (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "В �ети � помощью телефона или мобильного у�трой�тва"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова� �еть"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберите �еть IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Сбро�ить �пи�ок �етей"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбрать"
@@ -2199,86 +2218,48 @@ msgstr "новый �ервер"
 msgid "SSL"
 msgstr "Шифрование SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Св�зь � �обе�едниками"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Разъединить…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Полно�тью разъединить �в�занные контакты на отдельные контакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Св�зь"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Разъединить контакты «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Дей�твительно разъединить �ти �в�занные контакты? Это полно�тью разделит �в�занные контакты на отдельные контакты."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Разъединить"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "И�тори�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показать"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Пои�к"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор � %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2286,7 +2267,7 @@ msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунды"
 msgstr[2] "%s �екунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2294,121 +2275,121 @@ msgstr[0] "%s минута"
 msgstr[1] "%s минуты"
 msgstr[2] "%s минут"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Вызов продолжал�� %s, закончил�� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сегодн�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "В�егда"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Любой"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Кто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Когда"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "В�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Тек�товые чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Вход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "И�ход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропущенные вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Что"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Дей�твительно хотите удалить в�е журналы предыдущих бе�ед?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очи�тить в�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Удалить из:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Правка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Удалить в�ю и�торию…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Правка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�траница 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка…</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Указанный �обе�едник не находит�� в �ети"
@@ -2454,7 +2435,7 @@ msgid "There was an error starting the conversation"
 msgstr "Во врем� вызова произошла ошибка"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Введите идентификатор �обе�едника или номер телефона:"
 
@@ -2464,17 +2445,17 @@ msgid "New Conversation"
 msgstr "�ова� бе�еда"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_�удиовызов"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "�овый вызов"
 
@@ -2530,7 +2511,7 @@ msgstr "Другие �ообщени�…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "�ова� учетна� запи�ь %s"
@@ -2540,20 +2521,20 @@ msgid "Find:"
 msgstr "�айти:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "У_читывать реги�тр"
+msgid "_Previous"
+msgstr "_�азад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фраза не найдена"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Далее"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "У_читывать реги�тр"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_�азад"
+msgid "Phrase not found"
+msgstr "Фраза не найдена"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2599,12 +2580,12 @@ msgstr "Вызов завершён"
 msgid "Edit Custom Messages"
 msgstr "Изменить на�траиваемые �ообщени�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Сообщение изменено %s "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Обычна�"
 
@@ -2679,39 +2660,43 @@ msgid "Certificate hostname: %s"
 msgstr "Им� узла �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продолжить"
+msgid "C_ontinue"
+msgstr "_Продолжить"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�едоверенное �оединение"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Данное �оединение не �вл�ет�� доверенным. В�ё равно продолжить?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомнить выбор дл� по�ледующих �оединений"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Подробно�ти о �ертификате"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "�евозможно открыть URL"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выберите файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�едо�таточно �вободного ме�та дл� �охранени� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "Дл� �охранени� �того файла требует�� %s �вободного ме�та, но до�тупно только %s. Выберите другое ме�тоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щий файл от %s"
@@ -2891,23 +2876,23 @@ msgstr "Сообщение об ошибке от�ут�твует"
 msgid "Instant Message (Empathy)"
 msgstr "Мгновенное �ообщение (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "�е �оедин�ть�� при запу�ке"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е показывать �пи�ок �обе�едников и диалоговые окна при запу�ке"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " — клиент обмена мгновенными �ообщени�ми Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Ошибка �в�зи � ди�петчером учётных запи�ей"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2942,204 +2927,77 @@ msgstr ""
 "Mikhail Zabaluev\n"
 "Валёк Филиппов"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "При импортировании учётных запи�ей произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Во врем� разбора информации об учётной запи�и произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Во врем� �оздани� учётной запи�и произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Сообщение об ошибке: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Вы можете вернуть�� назад и попытать�� вве�ти информацию об учётной запи�и ещё раз, или закрыть �тот ма�тер и добавить учётные запи�и позже из меню «Правка»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Произошла ошибка"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Какой у ва� тип учётной запи�и?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "У ва� е�ть ещё какие-нибудь учётные запи�и дл� на�тройки?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Введите информацию о вашей учётной запи�и"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Какой тип учётной запи�и вы хотите �оздать?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Хотите �оздать другие учётные запи�и?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Введите информацию о новой учётной запи�и"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "С помощью Empathy можно общать�� � людьми, наход�щими�� поблизо�ти, а также � друзь�ми и коллегами, и�пользующими Google Talk, AIM, Windows Live и многие другие программы. При наличии микрофона и веб-камеры можно �овершать аудио- и видеовызовы."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "У ва� е�ть учётна� запи�ь, которую вы и�пользовали в другой программе?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Да, импортировать информацию о моей учётной запи�и"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, � �ейча� введу информацию об учётной запи�и"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "�ет, � хочу новую учётную запи�ь"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "�ет, � только хочу найти поблизо�ти людей в �ети"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Выберите учётные запи�и дл� импортировани�:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "�ет, на данный момент �то в�ё"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy может автоматиче�ки найти людей, подключённых к той же �ети, что и вы. Е�ли вы хотите и�пользовать �ту возможно�ть, отметьте, что информаци�, пред�тавленна� ниже �вл�ет�� корректной. Вы можете изменить �ту информацию позже или отключить �ту возможно�ть, и�пользу� диалоговое окно «Учётные запи�и»."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Правка->Учётные запи�и"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_Я не хочу �ейча� включать �ту возможно�ть"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Вы не можете общать�� � людьми, подключёнными к вашей локальной �ети, т. к. telepathy-salut не у�тановлен. Е�ли вы хотите включить �ту возможно�ть, у�тановите пакет telepathy-salut и �оздайте учётную запи�ь «Люди поблизо�ти» в диалоговом окне «Учётные запи�и»"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut не у�тановлен"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Ма�тер учётных запи�ей обмена �ообщени�ми и VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Добро пожаловать в Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Импортировать �уще�твующие учётные запи�и"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Введите пер�ональную информацию"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "В учётной запи�и %s имеют�� не�охранённые изменени�."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваша нова� учётна� запи�ь ещё не была �охранена."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Соединение…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "�е в �ети — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "От�оединён — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "�е в �ети — подключение к �ети от�ут�твует"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "�еизве�тный �тату�"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Эта учётна� запи�ь отключена, т. к. она и�пользует неподдерживаемый драйвер. У�тановите  telepathy-haze и перезапу�тите �еан�, чтобы перене�ти учётную запи�ь."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "�е в �ети — учётна� запи�ь отключена"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Изменить параметры �оединени�"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Сбой при получении пер�ональных данных � �ервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Выйти в онлайн, чтобы изменить пер�ональные данные"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Изменить параметры �оединени�…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Хотите удалить %s �о �воего компьютера?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Это не приведёт к удалению вашей учётной запи�и � �ервера."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3148,15 +3006,23 @@ msgstr ""
 "к отмене �деланных изменений. Хотите продолжить?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Отключить"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Пропу�тить"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Подключить��"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3168,45 +3034,37 @@ msgstr ""
 msgid "Add…"
 msgstr "Добавить…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Загрузка информации об учётной запи�и"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�ет у�тановленных протоколов"
+msgid "_Import…"
+msgstr "_Импорт..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Загрузка информации об учётной запи�и"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "Чтобы добавить новую учётную запи�ь у�тановите поддержку каждого необходимого протокола."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Импорт..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "�ет у�тановленных драйверов протоколов"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — клиент аутентификации Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Клиент аутентификации Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Люди поблизо�ти"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " — клиент Empathy дл� аудио и видео"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Клиент Empathy дл� аудио и видео"
 
@@ -3249,255 +3107,289 @@ msgstr "Подробно�ти"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-адре�, определённый хо�том"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адре�, определённый �ервером в Интернете"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адре� точки, определённый � другой �тороны"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-адре� ретран�лирующего �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Широковещательный IP-адре� группы"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Соединён — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Информаци� о �обе�еднике"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "�е удало�ь у�тановить �оединение � %s. Один из ва� может находить�� в �ети, котора� не поддерживает пр�мые подключени�."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Сбой �ети"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "�удиоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Видеоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Что-то неожиданное �лучило�ь � компонентом Telepathy. <a href=\"%s\">Сообщите об �той ошибке</a> и прикрепите журналы, �обранные из окна отладки в меню «Справка»."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Сбой в движке вызова"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "До�тигнут конец потока"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�е удало�ь у�тановить аудиопоток"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�е удало�ь у�тановить видеопоток"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�удио"
+msgid "_Call"
+msgstr "_Вызов"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодер:"
+msgid "_Microphone"
+msgstr "_Микрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Отключить камеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Показывать панель набора"
+msgid "_Settings"
+msgstr "_Параметры"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодер:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Вид"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Сбро�ить"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Справка"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершить текущий вызов"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Содержание"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальный кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "О_тладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Мак�имальный размер"
+msgid "Swap camera"
+msgstr "Сменить камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Минимальный размер"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удалённый кандидат:"
+msgid "Maximise me"
+msgstr "Мак�имальный размер"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Передавать звук"
+msgid "Disable camera"
+msgstr "Отключить камеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Передавать видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Сбро�ить"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Показывать панель набора"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Завершить текущий вызов"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видеовызов"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "�ачать видеовызов"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "�ачать аудиовызов"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Сменить камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Включить или выключить передачу звука"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Включить или выключить передачу видео"
+msgid "Show dialpad"
+msgstr "Показывать панель набора"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "�еизве�тно"
+msgid "Display the dialpad"
+msgstr "Показывать панель набора"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Передавать видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видеовызов"
+msgid "Toggle video transmission"
+msgstr "Включить или выключить передачу видео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Вызов"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Передавать звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Содержание"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Включить или выключить передачу звука"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "О_тладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодер:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "�еизве�тно"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Справка"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Декодер:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Микрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удалённый кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Параметры"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локальный кандидат:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Вид"
+msgid "Audio"
+msgstr "�удио"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрыть �то окно?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Е�ли вы закроете окно, то выйдете из комнаты %s. Вы не будете получать �ообщени�, пока не войдёте в комнату. "
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "Е�ли вы закроете окно, то выйдете из %u комнаты. Вы не будете получать �ообщени�, пока не войдёте в комнату. "
+msgstr[1] "Е�ли вы закроете окно, то выйдете из %u комнат. Вы не будете получать �ообщени�, пока не войдёте в комнаты."
+msgstr[2] "Е�ли вы закроете окно, то выйдете из %u комнат. Вы не будете получать �ообщени�, пока не войдёте в комнаты."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Уйти из %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Вы не будете получать �ообщени� из �той комнаты, пока повторно не войдёте в комнату."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрыть окно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Уйти из комнаты"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3505,7 +3397,7 @@ msgstr[0] "%s (%d непрочитанное)"
 msgstr[1] "%s (%d непрочитанных)"
 msgstr[2] "%s (%d непрочитанных)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3513,7 +3405,7 @@ msgstr[0] "%s (и %u другой)"
 msgstr[1] "%s (и %u других)"
 msgstr[2] "%s (и %u других)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3521,7 +3413,7 @@ msgstr[0] "%s (%d непрочитанное от других)"
 msgstr[1] "%s (%d непрочитанных от других)"
 msgstr[2] "%s (%d непрочитанных от других)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3529,11 +3421,11 @@ msgstr[0] "%s (%d непрочитанное ото в�ех)"
 msgstr[1] "%s (%d непрочитанных ото в�ех)"
 msgstr[2] "%s (%d непрочитанных ото в�ех)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3541,70 +3433,70 @@ msgstr[0] "Отправка %d �ообщени�"
 msgstr[1] "Отправка %d �ообщений"
 msgstr[2] "Отправка %d �ообщений"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "�абирает �ообщение."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "О_чи�тить"
+msgid "_Conversation"
+msgstr "_Бе�еда"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "Со_бе�едник"
+msgid "C_lear"
+msgstr "О_чи�тить"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "В�тавить _улыбку"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Избранна� комната"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Пригла�ить _уча�тника…"
+msgid "Notify for All Messages"
+msgstr "Уведомл�ть обо в�ех �ообщени�х"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Передвинуть вкладку в_лево"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Показывать �пи�ок �обе�едников"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Передвинуть вкладку в_право"
+msgid "Invite _Participant…"
+msgstr "Пригла�ить _уча�тника…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Уведомл�ть обо в�ех �ообщени�х"
+msgid "C_ontact"
+msgstr "Со_бе�едник"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Бе�еда"
+msgid "_Tabs"
+msgstr "В_кладки"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_От�оединить вкладку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Избранна� комната"
+msgid "_Previous Tab"
+msgstr "�а пред_ыдущую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "�а �лед_ующую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "�а пред_ыдущую вкладку"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Во��тановить закрытую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Показывать �пи�ок �обе�едников"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Передвинуть вкладку в_лево"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "В_кладки"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Передвинуть вкладку в_право"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Во��тановить закрытую вкладку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_От�оединить вкладку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3618,106 +3510,106 @@ msgstr "Комната"
 msgid "Auto-Connect"
 msgstr "�втоматиче�кое �оединение"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Управление избранными комнатами"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Вход�щий видеовызов"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Вход�щий вызов"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s делает видеовызов. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s вызывает ва�. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щий вызов от %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Отказать"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Ответить"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Ответить � _видео"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щий видеовызов от %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Приглашение к бе�еде"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Предложение при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s предлагает при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Войти"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s предложил при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Вам предложили при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вход�щий файл от %s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Требует�� пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "Пользователь %s хотел бы видеть, когда вы находите�ь в �ети"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3840,174 +3732,192 @@ msgstr "Передачи файлов"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Удалить из �пи�ка завершённые, отменённые или прерванные передачи файлов"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Импортировать"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "�е найдено учётных запи�ей дл� импортировани�. �а данный момент возможно импортировать учётные запи�и только из Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Импортировать учётные запи�и"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Импорт"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "И�точник"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Указать пароль"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Разъединить"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Чтобы увидеть �обе�едников, необходимо на�троить учётную запи�ь."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�ет �овпадений"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Учётные запи�и %s нельз� и�пользовать до тех пор, пока не будет обновлено приложение %s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Обновить приложение…"
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Переподключить��"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Правка учётной запи�и"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Пополнить %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Пополнить кредит �чёта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Пополнить…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Собе�едник"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Чтобы увидеть �обе�едников, необходимо включить одну из ваших учётных запи�ей."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Чтобы увидеть �обе�едников, необходимо включить учётную запи�ь %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спи�ок �обе�едников"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Собе�едники на _карте"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�а�троить учётную запи�ь"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "О�таток кредита"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "�ова� _бе�еда…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "�айти в �пи�ке _�обе�едников"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�овый _вызов…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "П_одключить избранные"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пои�к �обе�едников…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�а�троить избранные"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Передачи _файлов"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Обычный _размер"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Собе�едники _не в �ети"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�овый _вызов…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Показывать п_ротоколы"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Обычный размер � _аватарами"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "О�таток кредита"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Собе�едники на _карте"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Учётные запи�и"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Заблокированные �обе�едники"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Параметры"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Показывать п_ротоколы"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "�айти в �пи�ке _�обе�едников"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Упор�дочить по _имени"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Упор�дочить по �_тату�у"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Учётные запи�и"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Обычный размер � _аватарами"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Заблокированные �обе�едники"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Обычный _размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактный размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Передачи _файлов"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Комната"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Войти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "�ова� _бе�еда…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Собе�едники _не в �ети"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Лична� информаци�"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Комната"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "П_одключить избранные"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пои�к �обе�едников…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�а�троить избранные"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4019,7 +3929,7 @@ msgstr "Уча�тники"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4032,43 +3942,48 @@ msgstr ""
 "Требует�� пароль: %s\n"
 "Уча�тники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�ет"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е удало�ь начать формирование �пи�ка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е удало�ь о�тановить формирование �пи�ка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е удало�ь загрузить �пи�ок комнат"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Войти в комнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Введите им� бе�еды, к которой хотите при�оединить��, или выберите одну (или более) в �пи�ке."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Комната:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Введите �ервер бе�еды, или о�тавьте пу�тым, е�ли бе�еда находит�� на �ервере текущей учётной запи�и"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Войти в комнату"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е удало�ь загрузить �пи�ок комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ок комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Комната:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Сообщение получено"
@@ -4082,7 +3997,7 @@ msgid "New conversation"
 msgstr "�ова� бе�еда"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Собе�едник вошёл в �еть"
 
 #: ../src/empathy-preferences.c:170
@@ -4102,308 +4017,337 @@ msgid "Language"
 msgstr "Язык"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Джульета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео, о зачем же ты Ромео!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Покинь отца и отреки�ь навеки"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "От имени родного, а не хочешь —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Так покл�ни�ь, что любишь ты мен�, —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "И больше � не буду Капулетти."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Джульета отключила�ь"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Параметры"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Показывать _графиче�кие улыбки"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Показывать _�пи�ок �обе�едников в комнатах"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведение"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "�ачинать бе�еды в:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема оформлени� бе�еды:"
+msgid "new ta_bs"
+msgstr "новых _вкладках"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "В_ыключить уведомлени� в �о�то�нии «от�ут�твует» или «не бе�покоить»"
+msgid "new _windows"
+msgstr "новых о_кнах"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "В_ыключить звуки в �о�то�нии «от�ут�твует» или «не бе�покоить»"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показывать приближающие�� �обыти� в обла�ти уведомлений"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�втоматиче�ки �оедин�ть�� при запу�ке"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник �лышите �транные шумы или �бои во врем� разговора, попробуйте выключить подавление �ха и повторить вызов �обе�едника."
+msgid "Log conversations"
+msgstr "Ве�ти журнал бе�ед"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Включить уведомлени�, когда �обе�едник по�вл�ет�� в �ети"
+msgid "Behavior"
+msgstr "Поведение"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Включить уведомлени�, когда �обе�едник выходит из �ети"
+msgid "General"
+msgstr "Общие"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Включить уведомлени�, когда _бе�еда не в фоку�е"
+msgid "_Enable bubble notifications"
+msgstr "Включить _в�плывающие уведомлени�"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Включить проверку орфографии дл� �зыков:"
+msgid "Disable notifications when _away or busy"
+msgstr "В_ыключить уведомлени� в �о�то�нии «от�ут�твует» или «не бе�покоить»"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Общие"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Включить уведомлени�, когда _бе�еда не в фоку�е"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Включить уведомлени�, когда �обе�едник по�вл�ет�� в �ети"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "И�точники ме�тоположений:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Включить уведомлени�, когда �обе�едник выходит из �ети"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Ве�ти журнал бе�ед"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Уведомлени�"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Включить звуковые уведомлени�"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Во�производить звук дл� �обытий"
+msgid "Disable sounds when _away or busy"
+msgstr "В_ыключить звуки в �о�то�нии «от�ут�твует» или «не бе�покоить»"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Приватно�ть"
+msgid "Play sound for events"
+msgstr "Во�производить звук дл� �обытий"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Примерное определение ме�тоположени� означает, что публикует�� только ваш город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 знака по�ле зап�той."
+msgid "Sounds"
+msgstr "Звуки"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Показывать _графиче�кие улыбки"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "И�пользовать подавление _�ха дл� улучшени� каче�тва �в�зи"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Показывать _�пи�ок �обе�едников в комнатах"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Звуки"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Проверка орфографии"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник �лышите �транные шумы или �бои во врем� разговора, попробуйте выключить подавление �ха и повторить вызов �обе�едника."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
+msgid "_Publish location to my contacts"
+msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Темы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "И�пользовать подавление _�ха дл� улучшени� каче�тва �в�зи"
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Примерное определение ме�тоположени� означает, что публикует�� только ваш город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 знака по�ле зап�той."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Вариант:"
+msgid "_Reduce location accuracy"
+msgstr "_Снижать точно�ть определени� ме�тоположени�"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_�втоматиче�ки �оедин�ть�� при запу�ке"
+msgid "Privacy"
+msgstr "Приватно�ть"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "С_отова� �еть"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "Включить _в�плывающие уведомлени�"
+msgid "_Cellphone"
+msgstr "С_отова� �еть"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Включить звуковые уведомлени�"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "С_еть (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "И�точники ме�тоположений:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Открывать новые бе�еды в отдельном окне"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
+msgid "Enable spell checking for languages:"
+msgstr "Включить проверку орфографии дл� �зыков:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Проверка орфографии"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Снижать точно�ть определени� ме�тоположени�"
+msgid "Chat Th_eme:"
+msgstr "_Тема оформлени� бе�еды:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Вариант:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Темы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Со�то�ние"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Перезвонить �обе�еднику"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Камера выключена"
+msgid "Redial"
+msgstr "Перезвонить"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Камера включена"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Видео выключено"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключить камеру и о�тановить отправку видео"
+msgid "Video Preview"
+msgstr "Предварительный про�мотр видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включить камеру и отправить видео"
+msgid "Video On"
+msgstr "Видео включено"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включить камеру, но не отправл�ть видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Перезвонить �обе�еднику"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Предварительный про�мотр"
+msgid "Camera Off"
+msgstr "Камера выключена"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перезвонить"
+msgid "Disable camera and stop sending video"
+msgstr "Выключить камеру и о�тановить отправку видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Предварительный про�мотр"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Видео выключено"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Включить камеру, но не отправл�ть видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Видео включено"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Камера включена"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Предварительный про�мотр видео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Включить камеру и отправить видео"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Собе�едники на карте"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "С�ылка pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Ответ pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Слишком много данных дл� в�тавки. Сохраните журналы в файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Отправить в pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Отладка"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информаци�"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критиче�ка� ошибка"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Врем�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категори�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Выбранный менеджер �оединений не поддерживает ра�ширение удалённой отладки."
 
@@ -4420,31 +4364,27 @@ msgstr "Выберите �обе�едника дл� приглашени� к
 msgid "Invite"
 msgstr "Пригла�ить"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�е показывать диалоговые окна; выполнить работу (напр., импортирование) и выйти"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�е показывать диалоговые окна до тех пор, пока и�пользуют�� только уч. запи�и «Люди поблизо�ти»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Сначала выберите учётную запи�ь (например, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Показывать балан� в �пи�ке �обе�едников"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Учётные запи�и Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Учётные запи�и Empathy"
 
@@ -4460,86 +4400,86 @@ msgstr "— Отладчик Empathy"
 msgid "Empathy Debugger"
 msgstr "Отладчик Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr " — клиент обмена мгновенными �ообщени�ми Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Ответить"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Отказать"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Ответить"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Ответить � видео"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прин�ть"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Предо�тавить"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "Собе�едник %s попытал�� до ва� дозвонить��, но вы принимали другой вызов."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Инфо"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Удержание"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Приглушить"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Длительно�ть"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Текущий балан�: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�едо�таточно �ред�тв дл� �овершени� звонка."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Пополнить"
 
@@ -4547,11 +4487,191 @@ msgstr "Пополнить"
 msgid "_Match case"
 msgstr "_Учитывать реги�тр"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Какой у ва� тип учётной запи�и?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
 msgid "Adding new account"
 msgstr "Добавление учётной запи�и"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Люди поблизо�ти"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy может автоматиче�ки найти людей, подключённых к той же �ети, что и вы. Е�ли вы хотите и�пользовать �ту возможно�ть, отметьте, что информаци�, пред�тавленна� ниже �вл�ет�� корректной."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Вы можете отключить �ту возможно�ть или изменить информацию о �ебе, выбрав в �пи�ке �обе�едников <span style=\"italic\">Правка → Учётные запи�и</span>."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "При импортировании учётных запи�ей произошла ошибка."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Во врем� разбора информации об учётной запи�и произошла ошибка."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Во врем� �оздани� учётной запи�и произошла ошибка."
+
+#~ msgid "There was an error."
+#~ msgstr "Произошла ошибка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Сообщение об ошибке: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Вы можете вернуть�� назад и попытать�� вве�ти информацию об учётной "
+#~ "запи�и ещё раз, или закрыть �тот ма�тер и добавить учётные запи�и позже "
+#~ "из меню «Правка»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Произошла ошибка"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "У ва� е�ть ещё какие-нибудь учётные запи�и дл� на�тройки?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Введите информацию о вашей учётной запи�и"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Какой тип учётной запи�и вы хотите �оздать?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Хотите �оздать другие учётные запи�и?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Введите информацию о новой учётной запи�и"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "С помощью Empathy можно общать�� � людьми, наход�щими�� поблизо�ти, а "
+#~ "также � друзь�ми и коллегами, и�пользующими Google Talk, AIM, Windows "
+#~ "Live и многие другие программы. При наличии микрофона и веб-камеры можно "
+#~ "�овершать аудио- и видеовызовы."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "У ва� е�ть учётна� запи�ь, которую вы и�пользовали в другой программе?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Да, импортировать информацию о моей учётной запи�и"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Да, � �ейча� введу информацию об учётной запи�и"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�ет, � хочу новую учётную запи�ь"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�ет, � только хочу найти поблизо�ти людей в �ети"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Выберите учётные запи�и дл� импортировани�:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�ет, на данный момент �то в�ё"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Правка->Учётные запи�и"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Я не хочу �ейча� включать �ту возможно�ть"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Вы не можете общать�� � людьми, подключёнными к вашей локальной �ети, т. "
+#~ "к. telepathy-salut не у�тановлен. Е�ли вы хотите включить �ту "
+#~ "возможно�ть, у�тановите пакет telepathy-salut и �оздайте учётную запи�ь "
+#~ "«Люди поблизо�ти» в диалоговом окне «Учётные запи�и»"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut не у�тановлен"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Ма�тер учётных запи�ей обмена �ообщени�ми и VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Добро пожаловать в Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Импортировать �уще�твующие учётные запи�и"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Введите пер�ональную информацию"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Показывать балан� в �пи�ке �обе�едников"
+
+#~ msgid "Personal Information"
+#~ msgstr "Лична� информаци�"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Объединённые контакты"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Выбрать контакты дл� �в�зи"
+
+#~ msgid "New contact preview"
+#~ msgstr "Предпро�мотр нового �обе�едника"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Контакты, выбранные в �пи�ке �лева, будут объединены."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Объединить контакты…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Св�зь � �обе�едниками"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "_Разъединить…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Полно�тью разъединить �в�занные контакты на отдельные контакты."
+
+#~ msgid "_Link"
+#~ msgstr "_Св�зь"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Разъединить контакты «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Дей�твительно разъединить �ти �в�занные контакты? Это полно�тью разделит "
+#~ "�в�занные контакты на отдельные контакты."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_Разъединить"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Лична� информаци�"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Открывать новые бе�еды в отдельном окне"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "Мои �етевые учётные запи�и"
 
diff --git a/po/sl.po b/po/sl.po
index 5b56c2e33..ead7c53a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,492 +10,516 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-01-21 10:39+0000\n"
-"PO-Revision-Date: 2012-01-21 20:36+0100\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 12:36+0100\n"
 "Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenš�ina <gnome-si@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
+"Language: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Hipni sporo�ilnik"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy hipno sporo�anje"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Hipni sporo�ilnik"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Sporo�anje in ra�uni VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljanje s sporo�anjem in ra�uni VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Za nov klepet vedno odpri lo�eno klepetalno okno."
+msgid "Connection managers should be used"
+msgstr "Uporabljen naj bo upravljalnik omrežja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Naprava kamere"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Položaj kamere"
+msgid "Empathy should auto-connect on startup"
+msgstr "Program Empathy naj se samodejno poveže ob zagonu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše ra�une."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema klepetalnega okna"
+msgid "Empathy should auto-away when idle"
+msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Razli�ica teme klepetalnega okna"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Z vejico lo�en seznam uporabljenih �rkovalnikov (primer: \"sl, en, fr\")."
+msgid "Empathy default download folder"
+msgstr "Privzeta mapa za prenos datotek"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Skr�i seznam stikov"
+msgid "The default folder to save file transfers in."
+msgstr "Privzeta mapa za shranjevanje prejetih datotek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Uporabljen naj bo upravljalnik omrežja"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magi�no število, uporabljeno za preverjanje ali naj se naloge �iš�enja izvedejo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Kriterij razvrš�anja seznama stikov"
+msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
+msgstr "Število empathy-sanity-cleaning.c preverja ali naj se naloge �iš�enja izvedejo ali ne. Tega klju�a ni priporo�ljivo spreminjati ro�no."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Pot predmeta vodila D-Bus zadnjega izbranega ra�una pri pridruženju klepetalnici."
+msgid "Show offline contacts"
+msgstr "Pokaži tudi nepovezane stike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Privzeta mapa slik za izbor podobe"
+msgid "Show avatars"
+msgstr "Pokaži podobe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Onemogo�i pojavna obvestila ob odsotnosti"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Onemogo�i zvok ob odsotnosti"
+msgid "Show protocols"
+msgstr "Pokaži protokole"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja."
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
+msgid "Show Balance in contact list"
+msgstr "Pokaži stanje na ra�unu v seznamu stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Podpora odpravljanju odmevov"
+msgid "Whether to show account balances in the contact list."
+msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na ra�unu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
+msgid "Compact contact list"
+msgstr "Skr�i seznam stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ali naj bo v skr�enem pogledu prikazan seznam stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
+msgid "Hide main window"
+msgstr "Skrij glavno okno"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Program Empathy lahko uporabi omrežje za ugotavljanje mesta nahajanja"
+msgid "Hide the main window."
+msgstr "Skrivanje glavnega okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Privzeta mapa za prenos datotek"
+msgid "Default directory to select an avatar image from"
+msgstr "Privzeta mapa slik za izbor podobe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Zadnja mapa iz katere je bila izbrana podoba."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Program Empathy naj se samodejno poveže ob zagonu"
+msgid "Open new chats in separate windows"
+msgstr "Nov klepet naj se odpre v lo�enem oknu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Program Empathy naj zmanjša natan�nost dolo�evanja nahajanja"
+msgid "Always open a separate chat window for new chats."
+msgstr "Za nov klepet vedno odpri lo�eno klepetalno okno."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
+msgid "Display incoming events in the status area"
+msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Omogo�i razvojna orodja WebKit"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Omogo�i pojavna obvestila ob novih sporo�ilih"
+msgid "The position for the chat window side pane"
+msgstr "Položaj stranskega pladnja v klepetalnem oknu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Omogo�i �rkovalnik"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Shranjen položaj (v to�kah) stranskega pladnja v klepetalnem oknu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Skrij glavno okno"
+msgid "Show contact groups"
+msgstr "Pokaži skupine stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Skrivanje glavnega okna."
+msgid "Whether to show groups in the contact list."
+msgstr "Ali naj se v seznamu stikov pokažejo skupine stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Zadnji izbran ra�un v pogovornem oknu pridruženja klepetalnici"
+msgid "Contact list sort criterion"
+msgstr "Kriterij razvrš�anja seznama stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Znak na koncu vzdevka"
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Kateri kriterij naj se uporabi za razvrš�anje seznama stikov. Privzeto je razvrš�anje po stanju stika z vrednostjo \"stanje\". Vrednost \"ime\" pa razvrsti seznam poimensko."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Nov klepet naj se odpre v lo�enem oknu"
+msgid "Use notification sounds"
+msgstr "Uporabi zvoke obvestil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Pot do želene teme Adium "
+msgid "Whether to play a sound to notify of events."
+msgstr "Ali naj se predvaja zvok ob dogodkih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Pot do želene teme Adium, kadar je ta dolo�ena za klepet."
+msgid "Disable sounds when away"
+msgstr "Onemogo�i zvok ob odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Predvajaj zvok ob prejetju novih sporo�il"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Predvajaj zvok ob novih pogovorih"
+msgid "Play a sound for incoming messages"
+msgstr "Predvajaj zvok ob prejetju novih sporo�il"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Predvajaj zvok ob pošiljanju sporo�il"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ali naj se predvaja zvok ob prejetju novega sporo�ila."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Predvajaj zvok ob prijavi stika"
+msgid "Play a sound for outgoing messages"
+msgstr "Predvajaj zvok ob pošiljanju sporo�il"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Predvajaj zvok ob odjavi stika"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ali naj se predvaja zvok ob pošiljanju sporo�il."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Predvajaj zvok ob prijavi"
+msgid "Play a sound for new conversations"
+msgstr "Predvajaj zvok ob novih pogovorih"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Predvajaj zvok ob odjavi"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ali naj se predvaja zvok ob novih pogovorih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žariš�u."
+msgid "Play a sound when a contact logs in"
+msgstr "Predvajaj zvok ob prijavi stika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pokaži pojavna obvestila ob prijavi stikov"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pokaži pojavna obvestila ob odjavi stikov"
+msgid "Play a sound when a contact logs out"
+msgstr "Predvajaj zvok ob odjavi stika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Položaj predogleda kamere med klicem."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Pokaži stanje na ra�unu v seznamu stikov"
+msgid "Play a sound when we log in"
+msgstr "Predvajaj zvok ob prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Pokaži podobe"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Pokaži seznam stikov v klepetalnicah"
+msgid "Play a sound when we log out"
+msgstr "Predvajaj zvok ob odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Pokaži namig ob zapiranju glavnega okna"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Pokaži tudi nepovezane stike"
+msgid "Enable popup notifications for new messages"
+msgstr "Omogo�i pojavna obvestila ob novih sporo�ilih"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Pokaži protokole"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Jeziki za �rkovanje"
+msgid "Disable popup notifications when away"
+msgstr "Onemogo�i pojavna obvestila ob odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Privzeta mapa za shranjevanje prejetih datotek."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Zadnja mapa iz katere je bila izbrana podoba."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žariš�u."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Položaj stranskega pladnja v klepetalnem oknu"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila tudi, kadar je klepetalno okno že odprto, vendar ni v žariš�u."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Shranjen položaj (v to�kah) stranskega pladnja v klepetalnem oknu."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pokaži pojavna obvestila ob prijavi stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Razli�ica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pokaži pojavna obvestila ob odjavi stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Uporabi slikovne smeške"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Uporabi zvoke obvestil"
+msgid "Use graphical smileys"
+msgstr "Uporabi slikovne smeške"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Uporabi temo za klepetalnice"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ali naj se pri pogovorih smeški pretvorijo v sli�ice."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
+msgid "Show contact list in rooms"
+msgstr "Pokaži seznam stikov v klepetalnicah"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+msgid "Chat window theme"
+msgstr "Tema klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše ra�une."
+msgid "Chat window theme variant"
+msgstr "Razli�ica teme klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Razli�ica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natan�nost položaja."
+msgid "Path of the Adium theme to use"
+msgstr "Pot do želene teme Adium "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Pot do želene teme Adium, kadar je ta dolo�ena za klepet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Ali naj bodo vklju�ena razvijalna orodja WebKit kot je na primer Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Omogo�i razvojna orodja WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Ali naj bodo vklju�ena razvijalna orodja WebKit kot je na primer Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Ali naj se preverja �rkovanje besed v želenih jezikih."
+msgid "Inform other users when you are typing to them"
+msgstr "Obvesti druge uporabnike, da jim tipkate besedilo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ali naj se pri pogovorih smeški pretvorijo v sli�ice."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Ali naj se pošilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. Trenutno ne vpliva na stanje 'odsoten'."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Ali naj se omogo�i filter odpravljanja odmevov Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Uporabi temo za klepetalnice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ali naj se za klepetalnice uporablja tema."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
+msgid "Spell checking languages"
+msgstr "Jeziki za �rkovanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Ali naj se predvaja zvok ob dogodkih."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Z vejico lo�en seznam uporabljenih �rkovalnikov (primer: \"sl, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ali naj se predvaja zvok ob prejetju novega sporo�ila."
+msgid "Enable spell checker"
+msgstr "Omogo�i �rkovalnik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ali naj se predvaja zvok ob novih pogovorih."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Ali naj se preverja �rkovanje besed v želenih jezikih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ali naj se predvaja zvok ob pošiljanju sporo�il."
+msgid "Nick completed character"
+msgstr "Znak na koncu vzdevka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
+msgid "Last account selected in Join Room dialog"
+msgstr "Zadnji izbran ra�un v pogovornem oknu pridruženja klepetalnici"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Pot predmeta vodila D-Bus zadnjega izbranega ra�una pri pridruženju klepetalnici."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila tudi, kadar je klepetalno okno že odprto, vendar ni v žariš�u."
+msgid "Camera device"
+msgstr "Naprava kamere"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na ra�unu."
+msgid "Camera position"
+msgstr "Položaj kamere"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj predogleda kamere med klicem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
+msgid "Echo cancellation support"
+msgstr "Podpora odpravljanju odmevov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ali naj se omogo�i filter odpravljanja odmevov Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
+msgid "Show hint about closing the main window"
+msgstr "Pokaži namig ob zapiranju glavnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Ali naj bo pogovorno okno sporo�ila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Ali naj bo v skr�enem pogledu prikazan seznam stikov."
+msgid "Empathy can publish the user's location"
+msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ali naj bo pogovorno okno sporo�ila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ali naj se za klepetalnice uporablja tema."
+msgid "Empathy can use the network to guess the location"
+msgstr "Program Empathy lahko uporabi omrežje za ugotavljanje mesta nahajanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Kateri kriterij naj se uporabi za razvrš�anje seznama stikov. Privzeto je razvrš�anje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljanje s sporo�anjem in ra�uni VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Sporo�anje in ra�uni VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Program Empathy naj zmanjša natan�nost dolo�evanja nahajanja"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natan�nost položaja."
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Ni navedenega vzroka"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Zahtevana je bila zamenjava stanja"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Prenos datoteke ste preklicali"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Drug uporabnik je preklical prenos datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Prišlo je do napake med prenosom datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Drug uporabnik ne more prenesti datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Neznan vzrok"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je kon�an, vendar je datoteka pokvarjena"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Prenos datotek s strani oddaljenega stika ni podprt"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izbrana datoteka ni obi�ajna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zgrešen klic od %s"
@@ -511,166 +535,170 @@ msgstr "Klicanje uporabnika %s"
 msgid "Call from %s"
 msgstr "Klic uporabnika %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ni dolo�enega razloga"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je nastavljeno na brez povezave"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Napaka Å¡ifriranja"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Potrdilo ni potrjeno"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Neustrezno potrdilo gostitelja"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Neustrezen prstni odtis potrdila"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Å ifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Povezave ni mogo�e vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Vir je s strežnikom že povezan"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Ra�un je s strežnikom že povezan"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Ra�un na strežniku že obstaja"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Strežnik je trenutno preve� zaposlen za upravljanje s povezavo."
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je dolo�ena s šifrirno knjižnico."
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programska oprema je prestara"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Notranja napaka"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook klepetanje"
 
@@ -732,12 +760,26 @@ msgstr[3] "Pred %d meseci"
 msgid "in the future"
 msgstr "v prihodnosti"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Gesla ni mogo�e najti"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Geslo ra�una hipnega sporo�anja za %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Geslo za klepetalnico '%s' na ra�unu %s (%s)"
+
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Vsi ra�uni"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Ra�un"
 
@@ -755,30 +797,30 @@ msgstr "Strežnik"
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Uveljavi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Prijava"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ta ra�un na strežniku že obstaja"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Ustvari nov ra�un na strežniku"
 
@@ -787,137 +829,137 @@ msgstr "Ustvari nov ra�un na strežniku"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ra�un"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nov ra�un"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> Ime Zaslona"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Geslo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "Zaslonsko _ime:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> Ime Zaslona"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Geslo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapomni si geslo"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapomni si geslo"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Vrata:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Zapomni si geslo"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Zaslonsko _ime:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Strežnik:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Kakšno je vaše geslo AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Kakšno je vaše zaslonsko ime AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Vrata:"
+msgid "What is your AIM password?"
+msgstr "Kakšno je vaše geslo AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Strežnik:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> uporabniško ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapomni si geslo"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_D prijave:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> uporabniško ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Kakšen je vaš uporabniški ID GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Kakšno je vaše geslo GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "N_abor znakov:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Kakšen je vaš UIN ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Kakšno je vaše geslo ICQ?"
 
@@ -954,21 +996,25 @@ msgstr "Možnosti"
 msgid "None"
 msgstr "Brez"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Omrežje"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Znakovni nabor:"
+msgid "Network:"
+msgstr "Omrežje:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Ve�ina strežnikov IRC ne zahteva gesla, zato ga, �e niste prepri�ani, ne uporabite."
+msgid "Character set:"
+msgstr "Znakovni nabor:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Omrežje"
+msgid "Servers"
+msgstr "Strežniki"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Omrežje:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Ve�ina strežnikov IRC ne zahteva gesla, zato ga, �e niste prepri�ani, ne uporabite."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -986,48 +1032,20 @@ msgstr "Sporo�ilo kon�anja:"
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Strežniki"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Kakšen je vaš IRC vzdevek?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Katero IRC omrežje?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Primer:</b> uporabnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Primer:</b> uporabnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Zahtevano je Å¡ifriranje (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Prezri napake potrdila SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Prepiši nastavitve strežnika"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Prednos_t:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Kakšen je vaš IRC vzdevek?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Vir:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "kakšno je vaše uporabniško ime Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1037,179 +1055,203 @@ msgstr ""
 "V primeru, da ste facebook.com/<b>badger</b>, vnesite <b>badger</b>.\n"
 "Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za izbor uporabniškega imena, v kolikor ga še nimate."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Uporabi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Kakšno je vaše geslo Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "kakšno je vaše uporabniško ime Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Kakšen je vaš uporabniški ID Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> uporabnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Kakšno je vaše geslo Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> uporabnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Prezri napake potrdila SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Prednos_t:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Vir:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Zahtevano je Å¡ifriranje (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Uporabi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Prepiši nastavitve strežnika"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Kakšen je vaš uporabniški ID Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Kakšno je vaše geslo Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Kakšen je vaš želeni uporabniški ID Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Kakšno je vaše geslo Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Kakšno je vaše želeno geslo Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Primer:</b> uporabnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Kakšen je vaš ID Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Kakšno je vaše geslo Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Elektronski _naslov:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Vzdevek:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Priimek:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Objavljeno ime:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_ID Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Priimek:"
+msgid "E-_mail address:"
+msgstr "Elektronski _naslov:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Objavljeno ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Primer:</b> uporabnik@moj.sip.strežnik"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Uporabniško ime za overitev:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Odkrij povezave"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Samodejno odkrij strežnik STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uporabi ra�un za klicanje v daljnovodno omrežje in na mobilne telefone"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Prezri napake TLS"
+msgid "NAT Traversal Options"
+msgstr "Možnosti pre�kanja NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Razmik (v sekundah)"
+msgid "Proxy Options"
+msgstr "Možnosti posredniškega strežnika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Možnosti ohranjanja povezave"
+msgid "Miscellaneous Options"
+msgstr "Razli�ne možnosti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Ohlapno usmerjanje"
+msgid "STUN Server:"
+msgstr "Strežnik STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizem:"
+msgid "Discover the STUN server automatically"
+msgstr "Samodejno odkrij strežnik STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Razli�ne možnosti"
+msgid "Discover Binding"
+msgstr "Odkrij povezave"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Možnosti pre�kanja NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Strežnik:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Možnosti ohranjanja povezave"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Vrata:"
+msgid "Mechanism:"
+msgstr "Mehanizem:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Možnosti posredniškega strežnika"
+msgid "Interval (seconds)"
+msgstr "Razmik (v sekundah)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Uporabniško ime za overitev:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Prenos:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Strežnik STUN:"
+msgid "Loose Routing"
+msgstr "Ohlapno usmerjanje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Strežnik:"
+msgid "Ignore TLS Errors"
+msgstr "Prezri napake TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Prenos:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Uporabi ra�un za klicanje v daljnovodno omrežje in na mobilne telefone"
+msgid "Port:"
+msgstr "Vrata:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Kakšno je vaše geslo SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kakšen je prijavni ID vaše SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Kakšno je vaše geslo SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Prezri vabila na konference in v klepetalnice"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Jezikovne nastavitve seznama klepetalnic:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Kakšno je vaše geslo Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Jezikovne nastavitve seznama klepetalnic:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1247,213 +1289,219 @@ msgstr "Vse datoteke"
 msgid "Click to enlarge"
 msgstr "Kliknite za pove�avo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Prišlo je do napake med za�enjanjem klica"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Dolo�en stik ne podpira klicev."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Izbrani stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Izbrani stik ni veljaven"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Klic v sili ni podprt s tem protokolom"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Na ra�unu ni dovolj visokega zneska za vzpostavitev klica"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Tema ni podprta pri tem pogovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ni veljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: po�isti vsa sporo�ila trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: dolo�i temo trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID stika> [<sporo�ilo>]: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID stika> <sporo�ilo>: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <sporo�ilo>: pošlje sporo�ilo DEJANJA v trenutni pogovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <sporo�ilo>: pošlje <sporo�ilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporo�ila, ki se za�ne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID stika>: pokaže podrobnosti stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov na�in uporabe."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznan ukaz, za ve� si vpišite /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nezadostno stanje na ra�unu za pošiljanje sporo�il"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569
+#: ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Napaka med pošiljanjem sporo�ila '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571
+#: ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med pošiljanjem sporo�ila: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "Nezadostno stanje na ra�uni za pošiljanje sporo�ila. <a href='%s'>Povišaj</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ni mogo�e"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "predolgo sporo�ilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je dolo�ena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s dolo�a vsebino: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Ni dolo�ene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj '%s' v slovar"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj '%s' v slovar %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Vstavi smeška"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Predlogi �r_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1461,12 +1509,12 @@ msgstr "%s je prekinil povezavo"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izgnal %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1474,17 +1522,17 @@ msgstr "%s je bil izgnan"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je izob�il %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izob�en"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1494,17 +1542,17 @@ msgstr "%s je zapustil klepetalnico"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
@@ -1512,58 +1560,58 @@ msgstr "%s je preimenovan v %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279
+#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Napa�no geslo; poskusite znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Klepetalnica je zaš�itena z geslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Pogovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1595,10 +1643,10 @@ msgstr "Uredi blokirane stike"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Ra�un:"
 
@@ -1608,7 +1656,7 @@ msgstr "Blokirani stiki"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Odstrani"
@@ -1663,17 +1711,17 @@ msgstr[2] "_Poro�aj ta stika kot žaljiva"
 msgstr[3] "_Poro�aj te stike kot žaljive"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Odlo�i se _kasneje"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahteva po naro�ilu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokiraj_uporabnika"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Odlo�i se _kasneje"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1828,7 +1876,7 @@ msgstr "Nadmorska višina:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Mesto"
 
@@ -1854,6 +1902,16 @@ msgstr "Shrani podobo"
 msgid "Unable to save avatar"
 msgstr "Ni mogo�e shraniti podobe"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Osebne podrobnosti"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Podrobnosti stika"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Polno Ime"
@@ -1919,49 +1977,44 @@ msgstr "poštno"
 msgid "parcel"
 msgstr "paketno"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Mesto</b> na (datum)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Dolo�ilo:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Vzdevek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podrobnosti odjemalca"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Odjemalec:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Mesto</b> na (datum)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Podrobnosti stika"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Zahtevani podatki ..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Dolo�ilo:"
+msgid "Client Information"
+msgstr "Podrobnosti odjemalca"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Zahtevani podatki ..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Razli�ica:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Odjemalec:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Skupine"
@@ -1980,7 +2033,7 @@ msgid "Select"
 msgstr "Izbor"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1919
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Skupina"
 
@@ -2004,161 +2057,145 @@ msgstr[3] "Naslednjih identitet ni mogo�e blokirati:"
 msgid "Edit Contact Information"
 msgstr "Uredi podrobnosti stika"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani stiki"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Izbor stikov za povezovanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Nov predogled stika"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izbor ra�una za klicanje"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Kli�i"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Delo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Doma�a mapa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blokiraj stik"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Klepet"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Predhodni po_govori"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Souporaba namizja"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Priljubljeno"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Paket gnome-contacts ni nameš�en"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Poveži stike ..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Vabila v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Povabi v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Dodaj stik ..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ali zares želite odstraniti skupino '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ali zares želite odstraniti stik '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Odstranjevanje stika"
 
@@ -2175,7 +2212,7 @@ msgstr[3] "Povezan stik vklju�uje %u stike."
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Mesto</b> na (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
 
@@ -2204,86 +2241,48 @@ msgstr "nov strežnik"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Poveži stike"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Odstrani povezavo ..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Popolnoma razdeli prikazan povezani stik na posamezne stike."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Povezava"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Ali naj se razdelijo povezani stiki '%s' na posamezne stike?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Ali ste prepri�ani, da želite odstraniti povezane stike? S tem se bodo stiki razdelil na posamezne stike."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Odstrani povezavo"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Poiš�i"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Klepet s stikom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d. %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2292,7 +2291,7 @@ msgstr[1] "%s sekunda"
 msgstr[2] "%s sekundi"
 msgstr[3] "%s sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2301,121 +2300,121 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuti"
 msgstr[3] "%s minute"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Klic za�et %s, kon�an %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "V�eraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ali ste prepri�ani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Po�isti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Nalaganje ...</span>"
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Klepet"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Izbriši celotno zgodovino ..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Klepet"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Uredi"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "stran 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Nalaganje ...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Stik ni povezan v omrežje"
@@ -2461,7 +2460,7 @@ msgid "There was an error starting the conversation"
 msgstr "Prišlo je do napake med za�enjanjem pogovora"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Vnesite dolo�ilo stika ali pa telefonsko številko:"
 
@@ -2471,17 +2470,17 @@ msgid "New Conversation"
 msgstr "Nov pogovor"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Video klic"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nov klic"
 
@@ -2537,7 +2536,7 @@ msgstr "Sporo�ila po meri ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nov ra�un %s"
@@ -2547,20 +2546,20 @@ msgid "Find:"
 msgstr "Najdi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Upoštevaj _velikost �rk"
+msgid "_Previous"
+msgstr "_Predhodni"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Rekla ni mogo�e najti"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Naslednji"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Upoštevaj _velikost �rk"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Predhodni"
+msgid "Phrase not found"
+msgstr "Rekla ni mogo�e najti"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2606,12 +2605,12 @@ msgstr "Klic je kon�an"
 msgid "Edit Custom Messages"
 msgstr "Urejanje sporo�ila po meri"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Sporo�ilo je bilo nazadnje spremenjeno ob %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Obi�ajno"
 
@@ -2686,39 +2685,43 @@ msgid "Certificate hostname: %s"
 msgstr "Gostitelj potrdila: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Nadaljuj"
+msgid "C_ontinue"
+msgstr "_Nadaljuj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepreverjena povezava"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Povezava ni varna. Ali želite vseeno nadaljevati?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapomni si izbor za prihodnje povezave"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Podrobnosti potrdila"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Ni mogo�e odpreti naslova URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izbor datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Ni dovolj prostora za shranjevanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na voljo le %s. Izbrati bo treba drugo mesto."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prihajajo�a datoteka od %s"
@@ -2898,23 +2901,23 @@ msgstr "Ni sporo�il o napakah"
 msgid "Instant Message (Empathy)"
 msgstr "Hipno sporo�anje (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporo�ilnik"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika ra�unov"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2944,203 +2947,77 @@ msgstr "Odjemalec hipnega sporo�anja za namizje GNOME"
 msgid "translator-credits"
 msgstr "Matej Urban�i� <mateju@svn.gnome.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Prišlo je do napake med uvažanjem ra�unov."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Prišlo je do napake med raz�lenjevanjem podrobnosti ra�una."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Prišlo je do napake med ustvarjanjem ra�una."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Prišlo je do napake."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Sporo�ilo o napaki je bilo: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Lahko ponovno vnesete podatke svojega ra�una ali pa kon�ate pomo�nika in dodate ra�une kasneje preko menija Uredi."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Kakšno vrsto klepetalnega ra�una imate?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ali želite nastaviti še kakšen drug ra�un?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Vnesite podrobnosti svojega ra�una"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Kakšne vrste klepetalni ra�un naj bo ustvarjen?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Ali želite ustvariti druge klepetalne ra�une?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Vnesite podrobnosti novega ra�una"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi zvo�ne ali video klice."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ali imate ra�un, ki ste ga uporabljali z drugim programom?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Da, uvoziti želim podrobnosti ra�una iz"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Da, takoj želim vnesti podrobnosti ra�una"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Ne, ustvariti želim nov ra�un"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, želim le videti ljudi, povezane v bližini"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Izbor ra�une za uvoz:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Ne, to je trenutno vse"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podatke. Možnosti je mogo�e spreminjati tudi kasneje v pogovornemu oknu 'ra�uni'."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Uredi->Ra�uni"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Te možnosti trenutno _ne želim omogo�iti"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Ni mogo�e klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameš�en. V primeru, da želite to možnost omogo�iti, namestite zahtevani paket in ustvarite ra�un bližnjih uporabnikov med možnostmi ra�una."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ni nameš�en"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Pomo�nik sporo�anja in ra�unov VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Dobrodošli v program Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Uvozite svoje obstoje�e ra�une"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Vnesite osebne podatke"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Obstajajo neshranjene spremembe vašega %s ra�una."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Novi ra�un še ni bil shranjen."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Brez povezave - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Prekinjena povezava - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Brez povezave - ni omrežne povezave"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Neznano stanje"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Ta ra�un je onemogo�en, ker deluje na starem, nepodprtem ozadnjem programu. Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos ra�una."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Brez povezave - ra�un je onemogo�en"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Uredi parametre povezave"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Pridobivanje osebnih podrobnosti s strežnika je spodletelo."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Prijava v omrežje za urejanje osebnih podrobnosti."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Uredi parametre povezave ..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ali želite odstraniti %s iz ra�unalnika?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "To ne bo odstranilo vašega ra�una s strežnika."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3149,15 +3026,23 @@ msgstr ""
 "Ali ste prepri�ani, da želite nadaljevati?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Omogo�i"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "O_nemogo�i"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "Pre_sko�i"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Poveži"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3169,336 +3054,363 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj ..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Nalaganje podrobnosti ra�una"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ni nameš�enih protokolov"
+msgid "_Import…"
+msgstr "_Uvozi ..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Loading account information"
+msgstr "Nalaganje podrobnosti ra�una"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "Za dodajanje novega ra�una morate najprej namestiti zaledje za vsak protokol, ki ga želite uporabiti."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Uvozi ..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Ni nameš�enega ozadnjega protokola"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy odjemalec overitve"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy odjemalec overitve"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Uporabniki v bližini"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy odjemalec zvoka in slike"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy odjemalec zvoka in slike"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Svetlost"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Glasnost"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Stranska vrstica"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Zvo�ni vhod"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video vhod"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Števil�nica"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Klic z %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Naslov IP kot ga zazna strojna oprema"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Naslov IP kot ga zazna strežnik v omrežju"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Naslov IP posredovalnega strežnika"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Naslov IP skupine za ve�smerno oddajanje"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan - %d:%02d m"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehni�ne podrobnosti"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Program stika %s ne prepozna zvo�nih zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Ni mogo�e vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Prišlo je do napake na omrežju"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Zvo�ni zapisi za ta klic niso nameš�eni"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Video zapisi za ta klic niso nameš�eni"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Prišlo je do nepri�akovane napake v delu programa Telepathy. Pošljite <a href=\"%s\">poro�ilo o hroš�u</a> in pripnite dnevnik razhroš�evanja iz menija pomo�i."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Prišlo je do napake v klicnem programniku"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Dosežen je konec pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ni mogo�e vzpostaviti zvo�nega pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ni mogo�e vzpostaviti video pretoka"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Zvok"
+msgid "_Call"
+msgstr "Po_kli�i"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek odkodiranja:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Onemogo�i videokamero"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Pokaži števil�nico na zaslonu"
+msgid "_Settings"
+msgstr "_Nastavitve"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek kodiranja:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Pogled"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Odloži"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Pomo_�"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Odloži trenutni klic"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Vsebina"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Krajevni odjemalec:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Razhroš�evanje"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Razpni"
+msgid "Swap camera"
+msgstr "Zamenjaj videokamero"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Skr�i"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Oddaljeni odjemalec:"
+msgid "Maximise me"
+msgstr "Razpni"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Pošlji zvo�ni posnetek"
+msgid "Disable camera"
+msgstr "Onemogo�i videokamero"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Pošlji video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Odloži"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Pokaži števil�nico"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Odloži trenutni klic"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video klic"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Za�ni video klic"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Za�ni zvo�ni klic"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Zamenjaj videokamero"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Preklopi prenos zvoka"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Preklopi prenos videa"
+msgid "Show dialpad"
+msgstr "Pokaži števil�nico"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Neznano"
+msgid "Display the dialpad"
+msgstr "Pokaži števil�nico na zaslonu"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Pošlji video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video klic"
+msgid "Toggle video transmission"
+msgstr "Preklopi prenos videa"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "Po_kli�i"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Pošlji zvo�ni posnetek"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Vsebina"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Preklopi prenos zvoka"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Razhroš�evanje"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek kodiranja:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Neznano"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Pomo_�"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek odkodiranja:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Oddaljeni odjemalec:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Nastavitve"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Krajevni odjemalec:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Pogled"
+msgid "Audio"
+msgstr "Zvok"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Ali naj se okno zapre?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[1] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[2] "Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[3] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Ali naj se prekine povezava s klepetalnico %s?"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Nadaljnja sporo�ila s te klepetalnice ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zapri okno"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Zapusti klepetalnico"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3507,7 +3419,7 @@ msgstr[1] "%s (%d neprebrano)"
 msgstr[2] "%s (%d neprebrani)"
 msgstr[3] "%s (%d neprebrana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3516,7 +3428,7 @@ msgstr[1] "%s (in %u drugo)"
 msgstr[2] "%s (in %u drugi)"
 msgstr[3] "%s (in %u druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3525,7 +3437,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
 msgstr[2] "%s (%d neprebrani od drugih)"
 msgstr[3] "%s (%d neprebrana od drugih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3534,11 +3446,11 @@ msgstr[1] "%s (%d neprebrano od vseh)"
 msgstr[2] "%s (%d neprebrani od vseh)"
 msgstr[3] "%s (%d neprebrana od vseh)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3547,70 +3459,70 @@ msgstr[1] "Pošiljanje %d sporo�ila"
 msgstr[2] "Pošiljanje %d sporo�il"
 msgstr[3] "Pošiljanje %d sporo�il"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Pisanje sporo�ila."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "Po_�isti"
+msgid "_Conversation"
+msgstr "_Pogovor"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "S_tik"
+msgid "C_lear"
+msgstr "Po_�isti"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Vstavi _smeška"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Priljubljena klepetalnica"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Povabi _udeleženca ..."
+msgid "Notify for All Messages"
+msgstr "Obvesti o vseh novih sporo�ilih"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Premakni zavihek _levo"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Pokaži seznam stikov"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Premakni zavihek _desno"
+msgid "Invite _Participant…"
+msgstr "Povabi _udeleženca ..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Obvesti o vseh novih sporo�ilih"
+msgid "C_ontact"
+msgstr "S_tik"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Pogovor"
+msgid "_Tabs"
+msgstr "_Zavihki"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Odpni zavihek"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Priljubljena klepetalnica"
+msgid "_Previous Tab"
+msgstr "_Predhodni zavihek"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Predhodni zavihek"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Razveljavi zapiranje zavihka"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Pokaži seznam stikov"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Premakni zavihek _levo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Zavihki"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Premakni zavihek _desno"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Razveljavi zapiranje zavihka"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Odpni zavihek"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3624,106 +3536,106 @@ msgstr "Klepetalnica"
 msgid "Auto-Connect"
 msgstr "Samodejno povezovanje"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas kli�e preko video kanala. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas kli�e. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dohodni klic od %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Odgovori"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dohodni video klic od %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas vabi, da se pridružite v %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas je povabil v %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Povabljeni ste v %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prihajajo� prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3846,170 +3758,192 @@ msgstr "Prenosi datotek"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "S seznama odstrani kon�ane, preklicane in spodletele prenose datotek"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Uvozi"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Ni mogo�e najti ra�una za uvoz. Program trenutno podpira le uvoz ra�unov programa Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Uvozi ra�une"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Uvozi"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Vir"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Vpis gesla"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Ustrezno je treba nastaviti ra�un za prikaz stikov."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ni najdenih zadetkov."
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Ra�unov %s ni mogo�e uporabljati, dokler ni posodobljena programska oprema %s."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Posodobitev programske opreme ..."
 
-#: ../src/empathy-roster-window.c:805
-#: ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ponovno se poveži"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Uredi ra�un"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Povišaj %s (%s) ..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Povišaj znesek na ra�unu"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Povišaj ..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Stik"
 
-#: ../src/empathy-roster-window.c:2289
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Omogo�iti je treba enega izmed ra�unov za prikaz stikov."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Omogo�iti je treba ra�un %s za prikaz stikov."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Stiki na _zemljevidu"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Nastavitve ra�una"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Stanje na ra�unu"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nov pogovor ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Najdi v _seznamu stikov"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pridruži se _priljubljenim"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi priljubljene"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nov _klic ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Obi�ajna velikost"
+msgid "_Search for Contacts…"
+msgstr "Iskanje _stikov ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nov _klic ..."
+msgid "_File Transfers"
+msgstr "Prenosi _datotek"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Obi�ajna velikost s _podobami"
+msgid "_Offline Contacts"
+msgstr "Nepri_sotni stiki"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Možnosti"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Pokaži _protokole"
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Razvrsti po _imenu"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Stanje na ra�unu"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Razvrsti po _stanju"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Stiki na _zemljevidu"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Ra�uni"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Blokirani stiki"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Skr�en pogled"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Možnosti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Najdi v _seznamu stikov"
+
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Razvrsti po _imenu"
+
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Razvrsti po _stanju"
+
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Obi�ajna velikost s _podobami"
 
 #: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Prenosi _datotek"
+msgid "N_ormal Size"
+msgstr "_Obi�ajna velikost"
+
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Skr�en pogled"
 
 #: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Pridruži se"
+msgid "_Room"
+msgstr "_Klepetalnica"
 
 #: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nov pogovor ..."
+msgid "_Join…"
+msgstr "_Pridruži se"
 
 #: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nepri_sotni stiki"
-
-#: ../src/empathy-roster-window-menubar.ui.h:27
-msgid "_Room"
-msgstr "_Klepetalnica"
+msgid "Join _Favorites"
+msgstr "Pridruži se _priljubljenim"
 
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Search for Contacts…"
-msgstr "Iskanje _stikov ..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Uredi priljubljene"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4036,6 +3970,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
@@ -4047,30 +3986,30 @@ msgstr "Seznama klepetalnic ni bilo mogo�e za�eti"
 msgid "Could not stop room listing"
 msgstr "Seznama klepetalnic ni bilo mogo�e dokon�ati"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Seznama klepetalnic ni bilo mogo�e naložiti"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pridruži se klepetalnici"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali ve� klepetalnic s seznama."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Klepetalnica:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Vnesite gostujo�i strežnik klepetalnice ali pa pustite polje prazno, �e se klepetalnica nahaja na strežniku ra�una"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pridruži se klepetalnici"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Seznama klepetalnic ni bilo mogo�e naložiti"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Seznam klepetalnic"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Klepetalnica:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Sporo�ilo je bilo prejeto"
@@ -4084,7 +4023,7 @@ msgid "New conversation"
 msgstr "Nov pogovor"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Stik se je povezal"
 
 #: ../src/empathy-preferences.c:170
@@ -4104,349 +4043,374 @@ msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julija"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O, Romeo, Romeo, zakaj li Romeo?!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Odreci se rodu, odvrzi ime,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "�e ne, prisezi ve�no mi ljubezen,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "in dlje nisem Kapuletova."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Al' bi poslušal še, al govoril? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Možnosti"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Pokaži _smeške kot slike"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Pokaži _seznam stikov v klepetalnicah"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Videz"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Obnašanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Za�ni klepet v:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "T_ema klepetanja:"
+msgid "new ta_bs"
+msgstr "novi _zavihki"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Onemogo�i obvestila  ob _odsotnosti ali zaposlenosti"
+msgid "new _windows"
+msgstr "nova _okna"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Onemogo�i zvok ob _odsotnosti ali zaposlenosti"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaz prihajajo�ih dogodkov v obvestilnem podro�ju"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Samodejno _poveži ob zagonu "
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Odpravljanje odmevov omogo�i �istejši zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru, da med pogovorom zaslišite nenavadne zvoke ali šume, onemogo�ite odpravljanje odmevov in ponovno vzpostavite klic."
+msgid "Log conversations"
+msgstr "Beleži pogovore"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Omogo�i obvestila ob prijavah stikov"
+msgid "Behavior"
+msgstr "Obnašanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Omogo�i obvestila ob odjavah stikov"
+msgid "General"
+msgstr "Splošno"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogo�i obvestila, kadar _klepetalno okno ni v žariš�u"
+msgid "_Enable bubble notifications"
+msgstr "_Omogo�i obvestila v obla�kih"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Omogo�i preverjanje �rkovanja za jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "Onemogo�i obvestila  ob _odsotnosti ali zaposlenosti"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Splošno"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Omogo�i obvestila, kadar _klepetalno okno ni v žariš�u"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogo�i obvestila ob prijavah stikov"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Mesta virov:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogo�i obvestila ob odjavah stikov"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Beleži pogovore"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Obvestila"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Omogo�i zvo�na obvestila"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Predvajaj zvoke ob dogodkih"
+msgid "Disable sounds when _away or busy"
+msgstr "Onemogo�i zvok ob _odsotnosti ali zaposlenosti"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Zasebnost"
+msgid "Play sound for events"
+msgstr "Predvajaj zvoke ob dogodkih"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Zmanjšana natan�nost mesta pomeni, da ne bo objavljenih podatkov natan�nejših od mesta in države. Koordinate GPS bodo natan�ne na eno decimalno mesto."
+msgid "Sounds"
+msgstr "Zvoki"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Pokaži _smeške kot slike"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Pokaži _seznam stikov v klepetalnicah"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Zvoki"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Preverjanje �rkovanja"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Odpravljanje odmevov omogo�i �istejši zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru, da med pogovorom zaslišite nenavadne zvoke ali šume, onemogo�ite odpravljanje odmevov in ponovno vzpostavite klic."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Na seznamu jezikov so le tisti, za katere imate nameš�ene slovarje."
+msgid "_Publish location to my contacts"
+msgstr "O_bjavi mesto mojim stikom"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Teme"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Zmanjšana natan�nost mesta pomeni, da ne bo objavljenih podatkov natan�nejših od mesta in države. Koordinate GPS bodo natan�ne na eno decimalno mesto."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Razli�ica:"
+msgid "_Reduce location accuracy"
+msgstr "_Zmanjšaj natan�nost mesta"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "Samodejno _poveži ob zagonu "
+msgid "Privacy"
+msgstr "Zasebnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Mobilni telefon"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Omogo�i obvestila v obla�kih"
+msgid "_Cellphone"
+msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Omogo�i zvo�na obvestila"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Omrežje (IP, Wifi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Mesta virov:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "N_ove klepete odpiraj v lo�enih oknih"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Na seznamu jezikov so le tisti, za katere imate nameš�ene slovarje."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "O_bjavi mesto mojim stikom"
+msgid "Enable spell checking for languages:"
+msgstr "Omogo�i preverjanje �rkovanja za jezike:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Preverjanje �rkovanja"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Zmanjšaj natan�nost mesta"
+msgid "Chat Th_eme:"
+msgstr "T_ema klepetanja:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Razli�ica:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Kon�aj"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Znova pokli�i stik"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera ni omogo�ena"
+msgid "Redial"
+msgstr "Ponovno pokli�i"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera je omogo�ena"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video ni omogo�en"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogo�i kamero in zaustavi pošiljanje videa"
+msgid "Video Preview"
+msgstr "Predogled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogo�i kamero in za�ni pošiljati video"
+msgid "Video On"
+msgstr "Video je omogo�en"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogo�i kamero, vendar ne pošlji videa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Znova pokli�i stik"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Predogled"
+msgid "Camera Off"
+msgstr "Kamera ni omogo�ena"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovno pokli�i"
+msgid "Disable camera and stop sending video"
+msgstr "Onemogo�i kamero in zaustavi pošiljanje videa"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Predogled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video ni omogo�en"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Omogo�i kamero, vendar ne pošlji videa"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video je omogo�en"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera je omogo�ena"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Predogled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Omogo�i kamero in za�ni pošiljati video"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Prikaz zemljevida stikov"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Povezava odložiš�a Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odziv odložiš�a Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Preve� je podatkov za enkratno lepljenje. Beleženje dnevnika je priporo�ljivo shraniti v datoteko."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Razhroš�evalno okno"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pošlji na odložiš�e Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Razhroš�evanje"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Podrobnosti"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Sporo�ilo"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kriti�no"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno razhroš�evanje."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Povabi udeležence"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izbor stika za povabilo v pogovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in kon�aj"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Ne prikaži pogovornega okna, �e so na voljo le ra�unov \"uporabnikov v bližini\" "
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Predhodno izberite ra�un (na primer: gabble/jabber/foo_40primer_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id-ra�una>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Pokaži pomo�nika za ustvarjanje ra�unov"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy ra�uni"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy ra�uni"
 
@@ -4462,86 +4426,86 @@ msgstr "- razhroš�evalnik Empathy"
 msgid "Empathy Debugger"
 msgstr "Empathy razhroš�evalnik"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- sporo�ilnik Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Zavrni"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odgovori z videom"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odkloni"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Sprejmi"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Zagotovi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je klical med drugim pogovorom."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Zadržano"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Trenutno stanje je %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Na ra�unu ni dovolj visokega zneska za vzpostavitev klica."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Povišaj"
 
@@ -4549,10 +4513,179 @@ msgstr "Povišaj"
 msgid "_Match case"
 msgstr "_Upoštevaj velikost �rk"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Kakšno vrsto klepetalnega ra�una imate?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Dodajanje novega ra�una"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Uporabniki v bližini"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v istem omrežju. V primeru, da želite uporabljati to možnost, preverite spodnje podatke."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Te podrobnosti je mogo�e spreminjati in onemogo�iti tudi kasneje preko menija <span style=\"italic\">Uredi → Ra�uni</span> v seznamu stikov."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani stiki"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izbor stikov za povezovanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Nov predogled stika"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Poveži stike ..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Poveži stike"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "_Odstrani povezavo ..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Popolnoma razdeli prikazan povezani stik na posamezne stike."
+
+#~ msgid "_Link"
+#~ msgstr "_Povezava"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Ali naj se razdelijo povezani stiki '%s' na posamezne stike?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Ali ste prepri�ani, da želite odstraniti povezane stike? S tem se bodo "
+#~ "stiki razdelil na posamezne stike."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_Odstrani povezavo"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Prišlo je do napake med uvažanjem ra�unov."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Prišlo je do napake med raz�lenjevanjem podrobnosti ra�una."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Prišlo je do napake med ustvarjanjem ra�una."
+
+#~ msgid "There was an error."
+#~ msgstr "Prišlo je do napake."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Sporo�ilo o napaki je bilo: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Lahko ponovno vnesete podatke svojega ra�una ali pa kon�ate pomo�nika in "
+#~ "dodate ra�une kasneje preko menija Uredi."
+
+#~ msgid "An error occurred"
+#~ msgstr "Prišlo je do napake"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Ali želite nastaviti še kakšen drug ra�un?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Vnesite podrobnosti svojega ra�una"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Kakšne vrste klepetalni ra�un naj bo ustvarjen?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Ali želite ustvariti druge klepetalne ra�une?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Vnesite podrobnosti novega ra�una"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google "
+#~ "Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno "
+#~ "kamero in mikrofonom lahko uporabljate tudi zvo�ne ali video klice."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Ali imate ra�un, ki ste ga uporabljali z drugim programom?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Da, uvoziti želim podrobnosti ra�una iz"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Da, takoj želim vnesti podrobnosti ra�una"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, ustvariti želim nov ra�un"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ne, želim le videti ljudi, povezane v bližini"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izbor ra�une za uvoz:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, to je trenutno vse"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Uredi->Ra�uni"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Te možnosti trenutno _ne želim omogo�iti"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ni mogo�e klepetati z uporabniki, povezanimi v krajevnem omrežju, saj "
+#~ "paket telepathy-salut ni nameš�en. V primeru, da želite to možnost "
+#~ "omogo�iti, namestite zahtevani paket in ustvarite ra�un bližnjih "
+#~ "uporabnikov med možnostmi ra�una."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Pomo�nik sporo�anja in ra�unov VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Dobrodošli v program Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Uvozite svoje obstoje�e ra�une"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Vnesite osebne podatke"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Pokaži pomo�nika za ustvarjanje ra�unov"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "N_ove klepete odpiraj v lo�enih oknih"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "Vrsta vti�nice ni podprta"
 
diff --git a/po/sr.po b/po/sr.po
index 693635676..5ea6375f6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,528 +11,582 @@
 # Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
 # Милош Поповић <gpopac@gmail.com>, 2010.
 # Бранко Кокановић <branko.kokanovic@gmail.com>, 2011.
-# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011.
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-13 08:42+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ћа�кајте на Гугл разговору, Феј�буку, МС�-у и на многим другим �ерви�има за "
-"ћа�кање"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Интернет пи�моноша"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Програм за брзе поруке"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Допи�ивање преко Интернет пи�моноше"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Програм за брзе поруке"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ћа�кајте на Гугл разговору, Феј�буку, МС�-у и на многим другим �ерви�има за "
+"ћа�кање"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "�алози за допи�ивање и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управљајте налозима за допи�ивање и ВоИП"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Увек отвара по�ебан прозор за нова ћа�кања."
+msgid "Connection managers should be used"
+msgstr "Да ли ће бити коришћен управник мрежом"
 
+# �ије connect већ disconnect!!! ~Милош
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Јачина звука позива"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Да ли треба кори�тити управника мреже за аутомат�ко прекидање и поновно "
+"у�по�тављање везе."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Јачина звука позива, у процентима."
+msgid "Empathy should auto-connect on startup"
+msgstr "Да ли Пи�моноша да �ам у�по�тавити везу по покретању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Уређај камерице"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Да ли Пи�моноша да �е �ам пријави на по�тојеће налоге након покретања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Положај камерице"
+msgid "Empathy should auto-away when idle"
+msgstr "Да ли Пи�моноша да пређе у �тање аутомат�ког од�у�тва у мировању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Знак за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање надимка "
-"(таб) у групним ћа�кањима."
+"Да ли Пи�моноша да аутомат�ки пређе у �тање од�у�тва приликом мировања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Тема прозора за ћа�кање"
+msgid "Empathy default download folder"
+msgstr "Пи�моношина подразумевана фа�цикла за преузимања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Варијанта теме прозора за ћа�кање"
+msgid "The default folder to save file transfers in."
+msgstr "Подразумевана фа�цикла за чување прене�ених датотека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Спи�ак језика одвојен зарезима које кори�ти провера правопи�а (нпр. „sr, en, "
-"fr“)."
+"Магичан број коришћен за проверу ако задаци чишћења и�правно�ти треба да "
+"буду покренути"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Збијени �пи�ак пријатеља"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"„empathy-sanity-cleaning.c“ (чишћење и�правно�ти интернет пи�моноше) кори�ти "
+"овај број да провери да ли задаци чишћења треба да буду извршени или не. "
+"Кори�ници не треба ручно да мењају овај кључ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Да ли ће бити коришћен управник мрежом"
+msgid "Show offline contacts"
+msgstr "Приказује пријатеље ван мреже"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Критеријум за �ортирање пријатеља"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Да ли да приказује неповезане пријатеље у �пи�ку пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
-"video0“."
+msgid "Show avatars"
+msgstr "Приказује �лике"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Подразумевана фа�цикла за избор �лике"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "И�кључује и�качућа обавештења када �мо од�утни"
+msgid "Show protocols"
+msgstr "Приказује протоколе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Онемогућава звуке када �мо од�утни"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Приказује долазне догађаје на линији �тања"
+msgid "Show Balance in contact list"
+msgstr "Приказује готовину на �пи�ку пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Приказује долазне догађаје на линији �тања. �ко није по�тављено, одмах их "
-"приказује кори�нику."
+msgid "Whether to show account balances in the contact list."
+msgstr "Да ли да приказује изно� готовине налога у �пи�ку пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Подршка за уклањање одјека"
+msgid "Compact contact list"
+msgstr "Збијени �пи�ак пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Да ли Пи�моноша �ме да објављује локацију кори�ника"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Да ли да приказује �пи�ак пријатеља у збијеном режиму."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију"
+msgid "Hide main window"
+msgstr "Сакрива главни прозор"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију"
+msgid "Hide the main window."
+msgstr "Сакрива главни прозор програма."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију"
+msgid "Default directory to select an avatar image from"
+msgstr "Подразумевана фа�цикла за избор �лике"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Пи�моношина подразумевана фа�цикла за преузимања"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "По�ледња фа�цикла из које је изабрана �лика."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Пи�моноша је пребацио дневнике из лептира"
+msgid "Open new chats in separate windows"
+msgstr "Отвара нова ћа�кања у различитим прозорима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Да ли Пи�моноша да пређе у �тање аутомат�ког од�у�тва у мировању"
+msgid "Always open a separate chat window for new chats."
+msgstr "Увек отвара по�ебан прозор за нова ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Да ли Пи�моноша да �ам у�по�тавити везу по покретању"
+msgid "Display incoming events in the status area"
+msgstr "Приказује долазне догађаје на линији �тања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Да ли Пи�моноша да умањи прецизно�т локације"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Приказује долазне догађаје на линији �тања. �ко није по�тављено, одмах их "
+"приказује кори�нику."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Да ли Пи�моноша да кори�ти �лику пријатеља као иконицу прозора за ћа�кање"
+msgid "The position for the chat window side pane"
+msgstr "Положај бочне површи прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Омогућава Веб кит развојне алате"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћа�кање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Омогућава и�качућа обавештења за нове поруке"
+msgid "Show contact groups"
+msgstr "Приказује групе контакта"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Омогућава проверу пи�ања"
+msgid "Whether to show groups in the contact list."
+msgstr "Да ли да приказује групе у �пи�ку контакта."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Сакрива главни прозор"
+msgid "Contact list sort criterion"
+msgstr "Критеријум за �ортирање пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Сакрива главни прозор програма."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Који критеријум �е кори�ти за �ортирање �пи�ка пријатеља. Подразумевано �е "
+"кори�ти „state“ (�ортирање по �тању пријатеља). �ко је вредно�т „name“, "
+"�ортирање �е врши по имену пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Знак за довршавање надимка"
+msgid "Use notification sounds"
+msgstr "Кори�ти звукове за обавештења"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Отвара нова ћа�кања у различитим прозорима"
+msgid "Whether to play a sound to notify of events."
+msgstr "Да ли да пу�ти обавештајни звук за догађаје."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Путања до �дијум теме за коришћење"
+msgid "Disable sounds when away"
+msgstr "Онемогућава звуке када �мо од�утни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Путања до �дијум теме за коришћење, ако �е кори�ти �дијум тема за ћа�кање."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Да ли да пу�ти обавештајни звук када по�танете заузети или од�утни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Пушта звук за долазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Пушта звук за нове разговоре"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Да ли да пу�ти обавештајни звук када вам �тигне порука."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Пушта звук за одлазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Пушта звук када �е пријатељ пријави"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Да ли да пу�ти обавештајни звук када пошаљете поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Пушта звук када �е пријатељ одјави"
+msgid "Play a sound for new conversations"
+msgstr "Пушта звук за нове разговоре"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Пушта звук када �е ја пријавим"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Да ли да пу�ти обавештајни звук на нови разговор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Пушта звук када �е ја одјавим"
+msgid "Play a sound when a contact logs in"
+msgstr "Пушта звук када �е пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "И�пи�ује обавештења ако ћа�кање није у фоку�у"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи пријаве на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "И�пи�ује обавештења када �е пријатељ пријави"
+msgid "Play a sound when a contact logs out"
+msgstr "Пушта звук када �е пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "И�пи�ује обавештења када �е пријатељ одјави"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи одјаве �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Положај приказа камерице за време позива."
+msgid "Play a sound when we log in"
+msgstr "Пушта звук када �е ја пријавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Приказује готовину на �пи�ку пријатеља"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Да ли да пу�ти звук када �е пријавите на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Приказује �лике"
+msgid "Play a sound when we log out"
+msgstr "Пушта звук када �е ја одјавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Приказује �пи�ак пријатеља у �обама"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Да ли да пу�ти звук када �е одјавите �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Приказује �авет у вези затварања главног прозора"
+msgid "Enable popup notifications for new messages"
+msgstr "Омогућава и�качућа обавештења за нове поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Приказује пријатеље ван мреже"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Приказује протоколе"
+msgid "Disable popup notifications when away"
+msgstr "И�кључује и�качућа обавештења када �мо од�утни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Језици за проверу пи�ања"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Да ли да приказује облачић обавештења када �те заузети или од�утни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Подразумевана фа�цикла за чување прене�ених датотека."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "И�пи�ује обавештења ако ћа�кање није у фоку�у"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледња фа�цикла из које је изабрана �лика."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Да ли да приказује облачић обавештења �а при�тиглим порукама чак и када је "
+"прозор за ћа�кање отворен, али није у фоку�у."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Положај бочне површи прозора за ћа�кање"
+msgid "Pop up notifications when a contact logs in"
+msgstr "И�пи�ује обавештења када �е пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћа�кање."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ пријави на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Тема за приказ разговора у прозору ћа�кања."
+msgid "Pop up notifications when a contact logs out"
+msgstr "И�пи�ује обавештења када �е пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Варијанта теме која �е кори�ти за приказ разговора у прозору ћа�кања."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ одјави �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Приказује �личицу �а �мешком"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Кори�ти звукове за обавештења"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Да ли да приказује �мешке као �личице унутар разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Кори�ти теме за �обе ћа�кања"
+msgid "Show contact list in rooms"
+msgstr "Приказује �пи�ак пријатеља у �обама"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Да ли да приказује �пи�ак пријатеља у �обама за ћа�кање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
+msgid "Chat window theme"
+msgstr "Тема прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Тема за приказ разговора у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
+msgid "Chat window theme variant"
+msgstr "Варијанта теме прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Да ли је Пи�моноша пребацио дневнике из лептира."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варијанта теме која �е кори�ти за приказ разговора у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Да ли Пи�моноша да �е �ам пријави на по�тојеће налоге након покретања."
+msgid "Path of the Adium theme to use"
+msgstr "Путања до �дијум теме за коришћење"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Да ли Пи�моноша да аутомат�ки пређе у �тање од�у�тва приликом мировања."
+"Путања до �дијум теме за коришћење, ако �е кори�ти �дијум тема за ћа�кање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Да ли Пи�моноша да умањи прецизно�т локације због повећане приватно�ти."
+msgid "Enable WebKit Developer Tools"
+msgstr "Омогућава Веб кит развојне алате"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Да ли Пи�моноша да кори�ти �лику пријатеља као икону у прозору ћа�кања."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Ин�пектор."
 
-# �ије connect већ disconnect!!! ~Милош
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Обавештава о�тале кори�нике када им пишете поруку"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Да ли треба кори�тити управника мреже за аутомат�ко прекидање и поновно "
-"у�по�тављање везе."
+"Да ли ће да пошаље �тања ћа�кања „�а�тавља“ или „паузиран“. �еће утицати на "
+"�тање „отишао“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Да ли да проверава пи�ање речи за изабране језике."
+msgid "Use theme for chat rooms"
+msgstr "Кори�ти теме за �обе ћа�кања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Да ли да приказује �мешке као �личице унутар разговора."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Да ли да кори�ти тему за �обе разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Да ли ће бити укључен филтер Пул�е аудиа за уклањање одјека."
+msgid "Spell checking languages"
+msgstr "Језици за проверу пи�ања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи пријаве на мрежу."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спи�ак језика одвојен зарезима које кори�ти провера правопи�а (нпр. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи одјаве �а мреже."
+msgid "Enable spell checker"
+msgstr "Омогућава проверу пи�ања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Да ли да пу�ти обавештајни звук за догађаје."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Да ли да проверава пи�ање речи за изабране језике."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Да ли да пу�ти обавештајни звук када вам �тигне порука."
+msgid "Nick completed character"
+msgstr "Знак за довршавање надимка"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Да ли да пу�ти обавештајни звук на нови разговор."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање надимка "
+"(таб) у групним ћа�кањима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Да ли да пу�ти обавештајни звук када пошаљете поруку."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Да ли Пи�моноша да кори�ти �лику пријатеља као иконицу прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Да ли да пу�ти звук када �е пријавите на мрежу."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Да ли Пи�моноша да кори�ти �лику пријатеља као икону у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Да ли да пу�ти звук када �е одјавите �а мреже."
+msgid "Last account selected in Join Room dialog"
+msgstr "По�ледњи изабрани налог у прозорчету за придруживање �оби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Да ли да пу�ти обавештајни звук када по�танете заузети или од�утни."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путања објекта Д-ба�а по�ледњег налога изабраног за придруживање �оби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Да ли да приказује облачић обавештења када �е пријатељ одјави �а мреже."
+msgid "Camera device"
+msgstr "Уређај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Да ли да приказује облачић обавештења када �е пријатељ пријави на мрежу."
+"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Да ли да приказује облачић обавештења �а при�тиглим порукама чак и када је "
-"прозор за ћа�кање отворен, али није у фоку�у."
+msgid "Camera position"
+msgstr "Положај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
+msgid "Position the camera preview should be during a call."
+msgstr "Положај приказа камерице за време позива."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Да ли да приказује изно� готовине налога у �пи�ку пријатеља."
+msgid "Echo cancellation support"
+msgstr "Подршка за уклањање одјека"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Да ли ће бити укључен филтер Пул�е аудиа за уклањање одјека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Да ли да приказује неповезане пријатеље у �пи�ку пријатеља."
+msgid "Show hint about closing the main window"
+msgstr "Приказује �авет у вези затварања главног прозора"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Да ли да приказује облачић обавештења када �те заузети или од�утни."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Да ли да приказује поруку о затварању главног прозора када га затворите на "
+"„x“ дугме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
+msgid "Empathy can publish the user's location"
+msgstr "Да ли Пи�моноша �ме да објављује локацију кори�ника"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Да ли да приказује �пи�ак пријатеља у �обама за ћа�кање."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Да ли да приказује �пи�ак пријатеља у збијеном режиму."
+msgid "Empathy can use the network to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Да ли да приказује поруку о затварању главног прозора када га затворите на "
-"„x“ дугме."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Да ли да кори�ти тему за �обе разговора."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Да ли Пи�моноша да умањи прецизно�т локације"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Који критеријум �е кори�ти за �ортирање �пи�ка пријатеља. Подразумевано �е "
-"кори�ти „name“ (�ортирање по имену пријатеља). �ко је вредно�т „state“, "
-"�ортирање �е врши по �тању пријатеља."
+"Да ли Пи�моноша да умањи прецизно�т локације због повећане приватно�ти."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управљајте налозима за допи�ивање и ВоИП"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "�ије наведен разлог"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "�алози за допи�ивање и VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Захтевана је промена �тања"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Обу�тавили �те прено� датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Друга �трана је прекинула прено� датотеке"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Грешка приликом прено�а датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "�епознат разлог"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прено� датотеке је завршен, али је датотека оштећена"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Друга �трана не подржава прено� датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Изабрана датотека није обична датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Изабрана датотека је празна"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропуштен позив од %s"
@@ -548,169 +602,138 @@ msgstr "Позив кори�ника %s"
 msgid "Call from %s"
 msgstr "Позив од %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Вр�та прикључка није подржана"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "�ије наведен разлог"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Захтевана је промена �тања"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Обу�тавили �те прено� датотеке"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Друга �трана је прекинула прено� датотеке"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Грешка приликом прено�а датотеке"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "�епознат разлог"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "До�тупан"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Од�утан"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидљив"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "�еповезан"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "�ије наведен разлог"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Стање је по�тављено на „неповезан“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Грешка у мрежи"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�еу�пешна пријава"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Грешка при шифровању"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Име је у употреби"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертификат није про�леђен"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификат није од поверења"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификат је и�текао"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификат није активиран"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Име домаћина �ертификата �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Оти�ак �ертификата �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификат је �амопотпи�ан"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Грешка у �ертификату"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифровање није до�тупно"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертификат није и�праван"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Веза је одбијена"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Веза не може да �е у�по�тави"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Веза је изгубљена"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Овај ре�ур� је већ повезан �а �ервером"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Овај налог је већ повезан �а �ервером"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Веза је замењена новом везом кори�тећи и�ти ре�ур�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер је тренутно превише заузет да би у�по�тавио везу"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификат је опозван"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертификат кори�ти небезбедни алгоритам шифровања или је криптограф�ки �лаб"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,42 +741,49 @@ msgstr ""
 "Дужина �ертификата �ервера, или дубина ланца �ертификата �ервера премашује "
 "границе библиотеке за шифровање"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Ваш �офтвер је превише �тар"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутрашња грешка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Људи у околини"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Јаху! Јапан"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Гугл разговор"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Феј�бук ћа�кање"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Пре %d �екунде"
+msgstr[0] "Пре %d �екунд"
 msgstr[1] "Пре %d �екунде"
 msgstr[2] "Пре %d �екунди"
 msgstr[3] "Пре једне �екунде"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Пре %d минута"
+msgstr[0] "Пре %d минут"
 msgstr[1] "Пре %d минута"
 msgstr[2] "Пре %d минута"
 msgstr[3] "Пре једног минута"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +792,7 @@ msgstr[1] "Пре %d �ата"
 msgstr[2] "Пре %d �ати"
 msgstr[3] "Пре једног �ата"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +801,7 @@ msgstr[1] "Пре %d дана"
 msgstr[2] "Пре %d дана"
 msgstr[3] "Пре једног дана"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +810,7 @@ msgstr[1] "Пре %d недеље"
 msgstr[2] "Пре %d недеља"
 msgstr[3] "Пре једне недеље"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +819,211 @@ msgstr[1] "Пре %d ме�еца"
 msgstr[2] "Пре %d ме�еци"
 msgstr[3] "Пре једног ме�еца"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "у будућно�ти"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Лозинка није пронађена"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Лозинка ТП налога за %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Лозинка за причаоницу „%s“ на налогу %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Сви налози"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "�алог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Моји веб налози"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "�алог %s је измењен путем %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "�алог %s не може бити уређиван из Пи�моноше."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Покрени Моје веб налоге"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Измени %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Примени"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Пријави _ме"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "�аправи нови налог на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "По_ништи"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s налог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ови налог"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> Мој�адимак"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Лозинка:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "�апредно"
+msgid "Screen _Name:"
+msgstr "_�адимак:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> Мој�адимак"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Лозинка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запамти лозинку"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Запамти лозинку"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_�адимак:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Која је ваша �ИМ лозинка?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "�апредно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Који је ваш �ИМ надимак?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Која је ваша �ИМ лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> кори�ничко_име"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> кори�ничко_име"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Који је ваш Гроуп Вајз кори�нички ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Која је ваша Гроуп Вајз лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ИЦКу _КИБ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Кодни р_а�поред:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ИЦКу _КИБ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Који је ваш ИЦКу КИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Која је ваша ИЦКу лозинка?"
 
@@ -1043,11 +1060,23 @@ msgstr "Опције"
 msgid "None"
 msgstr "�ишта"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мрежа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мрежа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодни ра�поред:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сервери"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1084,6 @@ msgstr ""
 "Већина ИРЦ �ервера не тражи лозинку, зато ако ни�те �игурни, немојте је "
 "уно�ити."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мрежа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мрежа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "�адимак:"
@@ -1079,48 +1100,20 @@ msgstr "Порука за крај:"
 msgid "Real name:"
 msgstr "Право име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сервери"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Који је ваш ИРЦ надимак?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Која ИРЦ мрежа?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> korisnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> korisnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Захтева �е _шифровање(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Занемари грешке ССЛ �ертификата"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Превазиђи по�тавке �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Приоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Који је ваш ИРЦ надимак?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Ре�ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Које је ваше Феј�бук кори�ничко име?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1125,203 @@ msgstr ""
 "Уколико немате кори�ничко име за Феј�бук, идите на <a href=\"http://www."
 "facebook.com/username/\">ову �трану</a> да га изаберете."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Кори�ти �тари СС_Л"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Која је ваша Феј�бук лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Које је ваше Феј�бук кори�ничко име?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Који је ваш Гугл ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Која је ваша Гугл лозинка?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Занемари грешке ССЛ �ертификата"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Приоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ре�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Захтева �е _шифровање(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Кори�ти �тари СС_Л"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Превазиђи по�тавке �ервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Који је ваш �абер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Која је ваша �абер лозинка?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Који је ваш жељени �абер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Која је ваша �абер лозинка?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Која ја ваша жељена �абер лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Који је ваш Виндоуз Уживо ИБ ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Која је ваша Виндоуз Уживо лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "�дре�а _е-поште:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_�адимак:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Презиме:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Име:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Име за _објаву:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_�абер ИД:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Презиме:"
+msgid "E-_mail address:"
+msgstr "�дре�а _е-поште:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Име за _објаву:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Кори�ничко име за пријаву:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Откриј повезивања"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�утомат�ки откриј СТУ� �ервер"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Занемари ТЛС грешке"
+msgid "NAT Traversal Options"
+msgstr "Опције прола�ка кроз ��Т"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Период (у �екундама)"
+msgid "Proxy Options"
+msgstr "Опције по�редника"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опције за одржавање �талне везе"
+msgid "Miscellaneous Options"
+msgstr "Разне опције"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Слабо рутирање"
+msgid "STUN Server:"
+msgstr "СТУ� �ервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизам:"
+msgid "Discover the STUN server automatically"
+msgstr "�утомат�ки откриј СТУ� �ервер"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разне опције"
+msgid "Discover Binding"
+msgstr "Откриј повезивања"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опције прола�ка кроз ��Т"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опције за одржавање �талне везе"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизам:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опције по�редника"
+msgid "Interval (seconds)"
+msgstr "Период (у �екундама)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Кори�ничко име за пријаву:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "СТУ� �ервер:"
+msgid "Loose Routing"
+msgstr "Слабо рутирање"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Занемари ТЛС грешке"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Која је лозинка за ваш СИП налог?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Која је идентификација за СИП пријаву?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Кори�ничко име:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Која је лозинка за ваш СИП налог?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Јаху! И_Б:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Занемари позивнице за причаонице и конференције"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Лок_ални �пи�ак �оба:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Који је ваш Јаху! ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Која је ваша Јаху! лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Јаху! И_Б:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Лок_ални �пи�ак �оба:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1342,84 +1359,88 @@ msgstr "Све датотеке"
 msgid "Click to enlarge"
 msgstr "Кликните да увећате"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Дошло је до грешке приликом позивања"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "�аведени контакт не подржава позиве"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "�аведени контакт није на вези"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "�аведени контакт није и�праван"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Овај протокол не подржава хитне позиве"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "�емате довољно кредита да би�те могли да обавите овај позив"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "�и�ам у�пео да отворим приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Теме ни�у подржане у овом разговору"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "�ије вам дозвољено да промените тему"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ није и�праван ИБ контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: чи�ти �ве поруке из овог разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: по�тавља тему тренутног разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<ИБ �обе>] [<разлог>]: напушта �обу за ћа�кање, подразумевано тренутну"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <надимак>: мења ваш надимак на тренутном �ерверу"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <порука>: шаље поруку Р�ДЊ� на тренутни разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1450,11 @@ msgstr ""
 "порука које почињу �а „/“. �а пример: „/say /join �е кори�ти за прикључивање "
 "у нову �обу за ћа�кање“"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ИБ контакта>: приказује податке о контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1462,126 @@ msgstr ""
 "/help [<команда>]: приказује �ве подржане наредбе. �ко �е да и конкретна "
 "<наредба>, приказује њено упут�тво за употребу."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Коришћење: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "�епозната наредба"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "�епозната наредба; погледајте /help за до�тупне наредбе"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "нема довољно готовине за �лање поруке"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Грешка при �лању поруке „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Грешка при �лању поруке: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "нема довољно готовине за �лање поруке. <a href='%s'>Допуните</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "не�по�обан"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "неповезан"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "неи�праван пријатељ"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "при�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "порука је предуга"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "није подржано"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Грешка при �лању поруке „%s“: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Грешка при �лању поруке: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема је по�тављена на: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Тему је по�тавио %s на: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Тема није по�тављена"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(нема предлога)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додај „%s“ у речник за %s језик"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Убаци �мешак"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Предлози правопи_�а"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "�и�ам у�пео да преузмем �корашње дневнике"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s је отишао �а везе"
@@ -1555,12 +1589,12 @@ msgstr "%s је отишао �а везе"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s је избацио кори�ника %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s је избачен"
@@ -1568,17 +1602,17 @@ msgstr "%s је избачен"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s је забранио при�туп кори�нику %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Кори�нику %s је забрањен при�туп"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s је напу�тио(ла) причаоницу"
@@ -1588,17 +1622,17 @@ msgstr "%s је напу�тио(ла) причаоницу"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s је при�тупио(ла) причаоници"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је �ада познат као %s"
@@ -1606,90 +1640,90 @@ msgstr "%s је �ада познат као %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Да ли желите да запамтите ову лозинку?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "�е �ада"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Покушај поново"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Погрешна лозинка, покушајте поново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ова �оба је заштићена лозинком:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Прикључи �е"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (СМС)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "�епознати или неи�праван идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирање пријатеља је тренутно недо�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Блокирање пријатеља није до�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "При�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "�е могу да блокирам пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Измени блокиране пријатеље"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "�алог:"
 
@@ -1699,63 +1733,54 @@ msgstr "Блокирани пријатељи"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Уклони"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Умножи адре�у везе"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвори везу"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Измени податке контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Подаци о профилу"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�ови пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирати %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Да ли �те �игурни да желите да блокирате да ва� „%s“ више не контактира?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "П_ријави овај контакт за злоупотребу"
@@ -1764,401 +1789,315 @@ msgstr[2] "П_ријави ове контакте за злоупотребу"
 msgstr[3] "П_ријави овај контакт за злоупотребу"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Од_лучи ка�није"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Захтев за претплату"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блокирај кори�ника"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "�егрупи�ано"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Омиљени људи"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Уклањам групу"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Да ли �те �игурни да желите да уклоните пријатеља „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Уклањам пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Дод_ај пријатеља…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Блокирај контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ћа_�кање"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_�удио позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Претходни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Пошаљи датотеку"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Подели моју радну површ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Омиљени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Подаци"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Изм_ени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Позивам ва� у ову �обу"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Позов_и у �обу за ћа�кање"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Од_лучи ка�није"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Претражи контакте"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Претрага:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Дод_ај пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "�ије пронађен ниједан пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Порука која ва� пред�тавља:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Молим ва� обаве�тите не када �те на мрежи. Хвала!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Изаберите пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пуно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Број телефона:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "�дре�а е-поште:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Веб �траница:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рођендан:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Виђен пре:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Повезан �а:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Порука за од�утно�т:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ИСО код државе:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Држава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Република:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Поштан�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Зграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Спрат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "�дре�а:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "�иво тачно�ти:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "У�правна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Водоравна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Правац:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Брзина пењања:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "По�ледњи пут ажурирано:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Географ�ка дужина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Географ�ка ширина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Ви�ина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Локација"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сачувај �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�е могу да �ачувам �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Локација</b> у (датум)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "�адимак:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Подаци о клијенту"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Програм:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични подаци"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Детаљи о пријатељу"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Име и презиме"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Број телефона"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "�дре�а ел. поште"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Веб �траница"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рођендан"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Виђен пре:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Повезан �а:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Порука за од�утно�т:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "по�ао"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "кућа"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гла�овни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "првен�твени"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "поштан�ки"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "пошиљка"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "�адимак:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Локација</b> у (датум)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Захтевани �у подаци…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Подаци о клијенту"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Издање:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Програм:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групе"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2105,21 @@ msgstr ""
 "Изаберите групе у којима желите да �е пријатељ налази.  Приметите да можете "
 "да одаберете и више група као и ниједну."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Дод_ај групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Изабери"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следећи идентитет ће бити блокиран:"
@@ -2188,7 +2127,7 @@ msgstr[1] "Следећи идентитети ће бити блокирани:
 msgstr[2] "Следећи идентитети ће бити блокирани:"
 msgstr[3] "Следећи идентитет ће бити блокиран:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следећи идентитет не може бити блокиран:"
@@ -2196,79 +2135,144 @@ msgstr[1] "Следећи идентитети не могу бити блоки
 msgstr[2] "Следећи идентитети не могу бити блокирани:"
 msgstr[3] "Следећи идентитет не може бити блокиран:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Повезани пријатељи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изаберите пријатеља за повезивање"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед новог пријатеља"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Означени пријатељи на �пи�ку лево ће бити увезани заједно."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Измени податке контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изаберите налог који ће бити коришћен за позив"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "По�ао"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "КУЋ�"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Блокирај контакт"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "Ћа_�кање"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_СМС"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_�удио позив"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Видео позив"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Претходни разговори"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Пошаљи датотеку"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Подели моју радну површ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Омиљени"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "програм гномови контакти није ин�талиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Ин�талирајте „gnome-contacts“ да при�тупите подацима контаката."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Подаци"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Уреди"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Повежи контакте…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Позивам ва� у ову �обу"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Позов_и у �обу за ћа�кање"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Дод_ај пријатеља…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Избриши и _блокирај"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Уклањам групу"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Да ли �те �игурни да желите да уклоните пријатеља „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2281,11 @@ msgstr ""
 "Да ли �тварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и �ве "
 "контакте који �у везани за овај контакт."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Уклањам пријатеља"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2298,23 @@ msgstr[3] "Увезани пријатељ Ñ�адржи један контакÑ
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Локација</b> у (датум)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "�а вези преко телефона или мобилног уређаја"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова мрежа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Одаберите ИРЦ мрежу"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Ре�етуј _мрежни �пи�ак"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Изабери"
@@ -2319,91 +2327,48 @@ msgstr "нови �ервер"
 msgid "SSL"
 msgstr "ССЛ"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Повежи пријатеље"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Развежи…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Раздваја увезане контакте у по�ебне пријатеље."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Увежи"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Да развежем увезаног пријатеља „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Да ли �те �игурни да желите да развежете увезаног пријатеља? Овим ћете "
-"раздвојити увезане контакте у по�ебне пријатеље."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Развежи"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "И�торијат"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Прикажи"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Потражи"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Ћа�кање у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Ћа�кање �а %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2377,7 @@ msgstr[1] "%s �екунде"
 msgstr[2] "%s �екунди"
 msgstr[3] "једне �екунде"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2386,197 @@ msgstr[1] "%s минута"
 msgstr[2] "%s минута"
 msgstr[3] "једног минута"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Позив је започет %s, а завршен је %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Дана�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Било кад"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Било ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Када"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Било шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Пи�ана ћа�кања"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Долазни позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Одлазећи позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропуштени позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Да ли �те �игурни да желите да обришете �ве дневнике претходних разговора?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очи�ти �ве"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Обриши од:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Учитавам...</span>"
+msgid "_File"
+msgstr "_Датотека"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ћа�кање"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "Изм_ени"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Обриши �ав и�торијат..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профил"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Ћа�кање"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Изм_ени"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�трана 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ИБ пријатеља:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Учитавам...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ћ_а�кај"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Контакт није на вези"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "�аведени контакт или је неи�праван или непознат"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Контакт не подржава ову вр�ту разговора"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Захтевана функционално�т није примењена за овај протокол"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "�е могу да започнем разговор �а датим контактом"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Избачени �те �а овог канала"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Овај канал је пун"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Морате бити позвани да �е придружите овом каналу"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "�е могу да на�тавим док је веза прекинута"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Забрањен при�туп"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Дошло је до грешке приликом започињања разговора"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Уне�ите одредник контакта или телефон�ки број:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "�ови разговор"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Пошаљи _видео"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Видео позив"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Позови"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_�удио позив"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "�ови позив"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "�ије у�пело потврђивање идентитета за налог <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2602,12 +2613,8 @@ msgstr "Кликните да по�тавите ову поруку �тања
 msgid "Set status"
 msgstr "По�тави �тање"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "По�тавите ваше при�у�тво и тренутно �тање"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Произвољне поруке…"
 
@@ -2615,7 +2622,7 @@ msgstr "Произвољне поруке…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "�ови %s налог"
@@ -2625,20 +2632,20 @@ msgid "Find:"
 msgstr "Тражи:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Упореди величину �лова"
+msgid "_Previous"
+msgstr "_Претходно"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Израз није пронађен"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Следеће"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Упореди величину �лова"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Претходно"
+msgid "Phrase not found"
+msgstr "Израз није пронађен"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2691,12 @@ msgstr "Позив за разговор је завршен"
 msgid "Edit Custom Messages"
 msgstr "Уреди произвољне поруке"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Порука је уређена %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "�ормално"
 
@@ -2766,34 +2773,38 @@ msgid "Certificate hostname: %s"
 msgstr "Име домаћина �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "�а�тави"
+msgid "C_ontinue"
+msgstr "_�а�тави"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�еповерљива веза"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ова веза није од поверења. Желите ли ипак да на�тавите?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запамти овај избор за наредне везе"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Детаљи �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "�е могу да отворим адре�у"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "�ема довољно �лободног ме�та за чување датотеке"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2813,7 @@ msgstr ""
 "Потребно је %s за �нимање ове датотеке, али је до�тупно �амо %s. Одаберите "
 "друго ме�то за �нимање."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Долазећа датотека од %s"
@@ -2974,40 +2985,32 @@ msgstr "западни"
 msgid "Vietnamese"
 msgstr "вијетнам�ки"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Изабрани пријатељ не може да прими датотеке."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Изабрани пријатељ није на вези."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "�ема порука о грешкама"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Брза порука (Пи�моноша)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "�е повезуј �е по покретању"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "�е приказуј �пи�ак пријатеља нити било које друго прозорче по покретању"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— Интернет пи�моноша за брзе поруке"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при комуникацији �а Управником налога"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3058,11 @@ msgstr ""
 "адре�у: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Гномов програм за брзе поруке"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <dsegan@gmx.net>\n"
@@ -3071,222 +3074,83 @@ msgstr ""
 "\n"
 "Превод.орг — превод на �рп�ки језик."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Грешка при увожењу налога."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Грешка при обради детаља налога."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Грешка при прављењу налога."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Догодила �е грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "И�пи�ана порука грешке: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Можете �е или вратити и пробати да поново уне�ете детаље налога или да "
-"затворите помоћника и додате налоге ка�није из менија „Измени“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Дошло је до грешке"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Који тип налога за ћа�кање имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Да ли имате још неки налог за ћа�кање који желите да поде�ите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Уне�ите детаље налога"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Који тип налога за ћа�кање желите да направите?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Да ли желите да направите још налога за ћа�кање?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Уне�ите детаље новог налога"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Са Интернет Пи�моношом можете ћа�кати и �а људима у близини и �а пријатељима "
-"и колегама који кори�те Гугл разговор, �ИМ, Виндоуз уживо и многе друге "
-"програме за ћа�кање. Са микрофоном и камером такође можете да обављате и "
-"аудио и видео позиве."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Да ли имате налог који �те кори�тили �а неким другим програмом за ћа�кање?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, увези детаље мог налога из "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ја ћу �ам унети детаље налога"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "�е, желим нови налог"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, за �ада �амо желим да видим људе у близини"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изаберите налоге које желите да увезете:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "�е, то је �ве за �ада"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Пи�моноша може аутомат�ки да открије и ћа�ка �а људима који �у повезани на "
-"и�ту мрежу као и ви. �ко желите да кори�тите ову могућно�т, проверите да ли "
-"�у детаљи и�под тачни. Лако их можете изменити ка�није или и�кључити ову "
-"могућно�т из прозорчета „�алози“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Измени->�алози"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "За �ада _не желим да кори�тим ову могућно�т"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"�е могу да ћа�кам �а људима повезаним на вашу локалну мрежу јер telepathy-"
-"salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте пакет "
-"telepathy-salut и направите налог „Људи у околини“ из прозорчета „�алози“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut није ин�талиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "��и�тент налога за брзе поруке и ВоИП"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добродошли у Интернет Пи�моношу"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Увезите ваше по�тојеће налоге"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Уне�ите личне податке"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "По�тоје не�ачуване измене на вашем налогу %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваш нови налог још није �ачуван."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Повезујем �е…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "�еповезан — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Веза је прекинута — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "�еповезан — �ема мрежне конекције"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "�епознато �тање"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Овај налог је и�кључен зато што �е за�нива на �таром, неподржаном позадинцу. "
+"Ин�талирајте „telepathy-haze“ и поново покрените вашу �е�ију да преме�тите "
+"налог."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "�еповезан — �алог је онемогућен"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Овим ћете направити нови налог, занемаривши унете измене.\n"
-"Да ли �игурно желите да на�тавите?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Уредите параметре повезивања"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "�и�ам у�пео да довучем ваше личне податке �а �ервера."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "У�по�тавите везу да уредите ваше личне податке."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Уреди параметре повезивања..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Да ли �те �игурни да желите да уклоните „%s“ �а вашег рачунара?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ово неће уклонити ваш налог на �ерверу."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3159,23 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "О_немогући"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Пре�кочи"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Повежи �е"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3187,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Додај…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Учитавам податке о налогу"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�иједан протокол није ин�талиран"
+msgid "_Import…"
+msgstr "_Увези…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Учитавам податке о налогу"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3203,132 @@ msgstr ""
 "Да додате нови налог, прво морате да ин�талирате прикључке за �ве протоколе "
 "које желите да кори�тите."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Увези…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "�и�у ин�талирани позадинци протокола"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Људи у околини"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— Интернет пи�моноша �удио/Видео клијент"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Интернет пи�моноша �удио/Видео клијент"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "О�ветљено�т"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Гама"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Јачина звука"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Бочна површ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Звучни улаз"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Видео улаз"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Бројчаник"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Детаљи"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Позив �а кори�ником %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "ИП адре�а како је види овај рачунар"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ИП адре�а како је види �ервер на интернету"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ИП адре�а вршњака како је види друга �трана"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "ИП адре�а релејног �ервера"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "ИП адре�а групе за више�труко емитовање"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "�епознато"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "�епознато"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "�епознато"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "�епознато"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Повезан — %d:%02dм"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Технички детаљи"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3337,27 @@ msgstr ""
 "�е могу да у�по�тавим везу �а %s. Можда је неко од ва� двоје на мрежи која "
 "не дозвољава директне везе."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Дошло је до грешке у мрежи"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Звучни формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Видео формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3368,216 @@ msgstr ""
 "\">ову грешку</a> и прикачите дневнике покупљене из прозора „Отклањање "
 "грешака“ у менију „Помоћ“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Дошло је до грешке у мотору за позиве"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "До�тигнут је крај тока"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�е могу да у�по�тавим звучни ток"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�е могу да у�по�тавим видео ток"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�удио"
+msgid "_Call"
+msgstr "_Позови"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек за декодирање:"
+msgid "_Microphone"
+msgstr "Ми_крофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "И�кључите камерицу"
+msgid "_Camera"
+msgstr "_Камерица"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Прикажите бројчаник"
+msgid "_Settings"
+msgstr "По_дешавања"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек за кодирање:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "Пре_глед"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Прекини"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "По_моћ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Прекините тренутни позив"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Садржај"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локални кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Отклањање _грешака"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Увећај ме"
+msgid "Swap camera"
+msgstr "Размени камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Умањи ме"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удаљени кандидат:"
+msgid "Maximise me"
+msgstr "Увећај ме"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Пошаљи звук"
+msgid "Disable camera"
+msgstr "И�кључите камерицу"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Пошаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Прекини"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Прикажи бројчаник"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Прекините тренутни позив"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видео позив"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Започните видео позив"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Започните аудио позив"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Размени камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Укључи/и�кључи прено� звука"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Укључи/и�кључи прено� видеа"
+msgid "Show dialpad"
+msgstr "Прикажи бројчаник"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "�епознато"
+msgid "Display the dialpad"
+msgstr "Прикажите бројчаник"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Пошаљи видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видео позив"
+msgid "Toggle video transmission"
+msgstr "Укључи/и�кључи прено� видеа"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Позови"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Пошаљи звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камерица"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Садржај"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Укључи/и�кључи прено� звука"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Отклањање _грешака"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодек за кодирање:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "По_моћ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "�епознато"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Кодек за декодирање:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Ми_крофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удаљени кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "По_дешавања"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локални кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Пре_глед"
+msgid "Audio"
+msgstr "�удио"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Да затворим овај прозор?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Затварањем овог прозора биће напуштено %s. �ећете примати никакве будуће "
+"поруке �ве док �е поново не придружите."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Затварањем овог прозора биће напуштена %u �оба за ћа�кање. �ећете примати "
+"никакве будуће поруке �ве док �е поново не придружите."
+msgstr[1] ""
+"Затварањем овог прозора биће напуштене %u �обе за ћа�кање. �ећете примати "
+"никакве будуће поруке �ве док �е поново не придружите."
+msgstr[2] ""
+"Затварањем овог прозора биће напуштено %u �оба за ћа�кање. �ећете примати "
+"никакве будуће поруке �ве док �е поново не придружите."
+msgstr[3] ""
+"Затварањем овог прозора биће напуштена једна �оба за ћа�кање. �ећете примати "
+"никакве будуће поруке �ве док �е поново не придружите."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Да напу�тим %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"�ећете примати никакве будуће поруке из ове �обе за ћа�кање �ве док јој �е "
+"поново не придружите."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Затвори прозор"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "�апу�ти �обу"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3586,7 @@ msgstr[1] "%s (%d непрочитане)"
 msgstr[2] "%s (%d непрочитаних)"
 msgstr[3] "%s (једна непрочитана)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3595,7 @@ msgstr[1] "%s (и %u друге)"
 msgstr[2] "%s (и %u других)"
 msgstr[3] "%s (и једна друга)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3604,7 @@ msgstr[1] "%s (%d непрочитане од о�талих)"
 msgstr[2] "%s (%d непрочитаних од о�талих)"
 msgstr[3] "%s (једна непрочитана од о�талих)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3613,11 @@ msgstr[1] "%s (%d непрочитане од �вих)"
 msgstr[2] "%s (%d непрочитаних од �вих)"
 msgstr[3] "%s (једна непрочитана од �вих)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "СМС:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3626,69 @@ msgstr[1] "Шаљем %d поруке."
 msgstr[2] "Шаљем %d порука."
 msgstr[3] "Шаљем једну поруку"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Пише поруку."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Очи�ти"
+msgid "_Conversation"
+msgstr "_Разговор"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Пријатељ"
+msgid "C_lear"
+msgstr "_Очи�ти"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Убаци _�мешак"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Омиљена �оба за _ћа�кање"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Позови _уче�нике…"
+msgid "Notify for All Messages"
+msgstr "Обаве�ти за �ве поруке"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Преме�ти језичак _лево"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Прикажи _�пи�ак пријатеља"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Преме�ти језичак _де�но"
+msgid "Invite _Participant…"
+msgstr "Позови _уче�нике…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Обаве�ти за �ве поруке"
+msgid "C_ontact"
+msgstr "_Пријатељ"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Разговор"
+msgid "_Tabs"
+msgstr "_Ли�тови"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Откачи ли�т"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Омиљена �оба за _ћа�кање"
+msgid "_Previous Tab"
+msgstr "_Претходни ли�т"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Следећи ли�т"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Претходни ли�т"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Опозови затварање језичка"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Прикажи _�пи�ак пријатеља"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Преме�ти језичак _лево"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Ли�тови"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Преме�ти језичак _де�но"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Опозови затварање језичка"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Откачи ли�т"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3702,100 @@ msgstr "Соба"
 msgid "Auto-Connect"
 msgstr "�утомат�ко повезивање"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Уреди омиљене �обе"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Долазни видео позив"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ва� зове видео позивом. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ва� зове. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Долазни позив од %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Одбаци"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Јави �е"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Одговори �а _видеом"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Долазни видео позив од %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Позивнице за �обу"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Позивница да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Прикључи �е"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Позвани �те да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Долазни прено� датотеке од %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Захтевана је лозинка"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s тражи одобрење да види када �те на вези"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3805,105 @@ msgstr ""
 "Порука: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s од %s при %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Примам „%s“ од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Шаљем „%s“ за %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при примању „%s“ од %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при примању датотеке"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при �лању „%s“ за %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при �лању датотеке"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ је примљен од %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ је по�лат за %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Прено� датотеке је завршен"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Чекам на одговор друге �тране"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверавам интегритет датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Тражим хеш датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Прео�тало"
 
@@ -4008,7 +3915,11 @@ msgstr "Прено�и датотека"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Уклони завршене, отказане и неу�пешне прено�е датотека �а �пи�ка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Увези"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3927,198 @@ msgstr ""
 "�и�ам пронашао ниједан налог за увоз. Интернет пи�моноша тренутно подржава "
 "�амо увожење налога из Пиџина."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Увезите налоге"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Увези"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Извор"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Уне�ите лозинку"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Веза је прекинута"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Морате да поде�ите налог да би�те овде видели контакте."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�ема поклапања"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Извините, %s налози не могу бити коришћени �ве док не ажурирате ваш %s "
+"�офтвер."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "�журирај �офтвер..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Затвори"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Поново �е повежи"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Измени налог"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Затвори"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Допуни %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Допуните кредит налога"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Допуни..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Пријатељ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Морате да укључите један од ваших налога да би�те овде видели контакте."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Морате да укључите %s да би�те овде видели контакте."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спи�ак пријатеља"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Пријатељи на _мапи"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Подешавања налога"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Изно� готовине"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ови разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Пронађи у _�пи�ку пријатеља"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�ови _позив…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Придружи �е _омиљеним"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Тражи пријатеље…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Уреди омиљене"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Прено�и _датотека"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "�_ормална величина"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "�еп_овезани пријатељи"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�ови _позив…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Прикажи _протоколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "�ормална величина �а _аватарима"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Изно� готовине"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Пријатељи на _мапи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "�_алози"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Блокирани пријатељи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_По�тавке"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Прикажи _протоколе"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Пронађи у _�пи�ку пријатеља"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Поређај према _имену"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Поређај према _�тању"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "�_алози"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "�ормална величина �а _аватарима"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Блокирани пријатељи"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "�_ормална величина"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактна величина"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Прено�и _датотека"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Соба"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Прикључи �е…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_�ови разговор…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "�еп_овезани пријатељи"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Лични _подаци"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Соба"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Придружи �е _омиљеним"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Тражи пријатеље…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Уреди омиљене"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Соба за ћа�кање"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Чланови"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4131,27 @@ msgstr ""
 "Потребна лозинка: %s\n"
 "Чланови: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е могу да покренем ли�тање �пи�ка �оба"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е могу да зау�тавим ли�тање �пи�ка �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е могу да учитам �пи�ак �оба"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Придружи �е �оби"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4160,10 @@ msgstr ""
 "Овде уне�ите име �обе за придруживање или кликните на неку од �оба на �пи�ку."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Соба:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,505 +4171,829 @@ msgstr ""
 "Уне�ите �ервер који угошћава �обе, или о�тавите празно ако �у �обе на "
 "�ерверу на којем вам је налог"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Придружи �е �оби"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е могу да учитам �пи�ак �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ак �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Соба:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Порука је примљена"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Порука је по�лата"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "�ови разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Пријатељ �е пријавио"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Пријатељ �е одјавио"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "�алог је на вези"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "�алог није на вези"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Језик"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Паја"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Јаре"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Јао, куме, готов �ам!! Ја �ам бивши човек!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Пајо, шта је било, Пајооо??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Како шта је било?? �ема је више, украли �у ми је!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Шта �у ти украли, Пајо?? Штаааа??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Како шта?? �ма лађу, украли �у ми лађу!! Јао мени!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Сав очајан, Паја је прекинуо везу."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "По�тавке"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Прикажи �лике _�мешака"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Прикажи �пи�ак _пријатеља у �обама"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Понашање"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Започни ћа�кања у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема ћа�кања:"
+msgid "new ta_bs"
+msgstr "новим _језичцима"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "И�кључи обавештења када �ам _од�утан или заузет"
+msgid "new _windows"
+msgstr "новим _прозорима"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "И�кључи звуке када �ам _од�утан или заузет"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Прикажи долазне догађаје у обавештајној зони"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Сам �е повежи након покретања"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Уклањање одјека чини да ваш гла� другој о�оби звучи ја�није, али може да "
-"изазове проблеме на неким рачунарима. �ко ви или ваш �аговорник чујете чудне "
-"шумове или крчање за време позива, покушајте да и�кључите уклањање одјека и "
-"поново покрените позив."
+msgid "Log conversations"
+msgstr "Забележи разговоре"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Омогући обавештења када пријатељ дође на мрежу"
+msgid "Behavior"
+msgstr "Понашање"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Омогући обавештења када пријатељ оде �а мреже"
+msgid "General"
+msgstr "Опште"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Омогући обавештења када _ћа�кања ни�у у фоку�у"
+msgid "_Enable bubble notifications"
+msgstr "_Омогући обавештења у облачићима"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Омогући проверу правопи�а за �ледеће језике:"
+msgid "Disable notifications when _away or busy"
+msgstr "И�кључи обавештења када �ам _од�утан или заузет"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Опште"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Омогући обавештења када _ћа�кања ни�у у фоку�у"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Улазни ниво:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Омогући обавештења када пријатељ дође на мрежу"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Јачина улазног звука:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Омогући обавештења када пријатељ оде �а мреже"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Обавештења"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Извори локација:"
+msgid "_Enable sound notifications"
+msgstr "Омогући _звучна обавештења"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Забележи разговоре"
+msgid "Disable sounds when _away or busy"
+msgstr "И�кључи звуке када �ам _од�утан или заузет"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Обавештења"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Пу�ти звук за догађаје"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Звуци"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Приватно�т"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Кори�ти уклањање _одјека да побољшаш квалитет позива"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Умањена тачно�т локације значи да ће најтачнији објављени подаци о вашој "
-"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Прикажи �лике _�мешака"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Прикажи �пи�ак _пријатеља у �обама"
+"Уклањање одјека чини да ваш гла� другој о�оби звучи ја�није, али може да "
+"изазове проблеме на неким рачунарима. �ко ви или ваш �аговорник чујете чудне "
+"шумове или крчање за време позива, покушајте да и�кључите уклањање одјека и "
+"поново покрените позив."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Звуци"
+msgid "_Publish location to my contacts"
+msgstr "Објави локацију мојим _пријатељима"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Провера пи�ања"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
-"речнике."
+"Умањена тачно�т локације значи да ће најтачнији објављени подаци о вашој "
+"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Теме"
+msgid "_Reduce location accuracy"
+msgstr "Умањи _тачно�т локације"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Варијанта:"
+msgid "Privacy"
+msgstr "Приватно�т"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Сам �е повежи након покретања"
+msgid "_GPS"
+msgstr "_ГПС"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилни телефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Омогући обавештења у облачићима"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (ИП, бежична)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Омогући _звучна обавештења"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_ГПС"
+msgid "Location sources:"
+msgstr "Извори локација:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (ИП, бежична)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
+"речнике."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Отварај ћа�кања у новим прозорима"
+msgid "Enable spell checking for languages:"
+msgstr "Омогући проверу правопи�а за �ледеће језике:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Објави локацију мојим _пријатељима"
+msgid "Spell Checking"
+msgstr "Провера пи�ања"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Тема ћа�кања:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Умањи _тачно�т локације"
+msgid "Variant:"
+msgstr "Варијанта:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Теме"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стање"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Позови пријатеља поново"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "И�кљ. камеру"
+msgid "Redial"
+msgstr "Поново зови"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Укљ. камеру"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "И�кљ. видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Онемогући камеру и пре�тани да шаљеш видео"
+msgid "Video Preview"
+msgstr "Преглед видеа"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Омогући камеру и шаљи видео"
+msgid "Video On"
+msgstr "Укљ. видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Омогући камеру, али не шаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Позови пријатеља поново"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+msgid "Camera Off"
+msgstr "И�кљ. камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Поново зови"
+msgid "Disable camera and stop sending video"
+msgstr "Онемогући камеру и пре�тани да шаљеш видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "И�кљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Омогући камеру, али не шаљи видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Укљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Укљ. камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед видеа"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Омогући камеру и шаљи видео"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Мапа пријатеља"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Веза канте одлагања"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Одговор канте одлагања"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Подаци �у превелики за једно одлагање. Сачувајте запи�нике у датотеку."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Прозор за отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Пошаљи у канту одлагања"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "�иво: "
+msgstr "�иво "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информације"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критичан"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категорија"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Изабрани управник везе не подржава проширење за удаљено отклањање грешака."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Позови уче�нике"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Изаберите пријатеља за позивање у овај разговор:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Позови"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е приказуј ниједно прозорче; уради по�ао који имаш (нпр. увожење) и изађи"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е приказуј ниједно прозорче о�им ако не по�тоје �амо налози „Људи у близини“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Почетно изабирање датог налога (нпр. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<идентификација налога>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— �алози Пи�моноше"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "�алози Пи�моноше"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Прикажи по�ебну у�лугу"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Пи�моноша програм за ћа�кање"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Одговори"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Одбаци"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Јави �е"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Одговори �а видеом"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прихвати"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Обезбеди"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s је покушао да ва� зове, али �те ви били на другој вези."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "и"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "�а чекању"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Утишај"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Трајање"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Ваше тренутно �тање је %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Извините, али немате довољно кредита за овај позив."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Допуни"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Упореди величину �лова"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Који тип налога за ћа�кање имате?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Додајем нови налог"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Људи у околини"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Пи�моноша може аутомат�ки да открије и ћа�ка �а људима који �у повезани на "
+"и�ту мрежу као и ви. �ко желите да кори�тите ову могућно�т, проверите да ли "
+"�у детаљи и�под тачни."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Можете ка�није да измените те детаље или да и�кључите ову могућно�т тако што "
+"ћете изабрати <span style=\"italic\">Уреди → �алози</span> �а �пи�ка "
+"контаката."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Грешка при увожењу налога."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Грешка при обради детаља налога."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Грешка при прављењу налога."
+
+#~ msgid "There was an error."
+#~ msgstr "Догодила �е грешка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "И�пи�ана порука грешке: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Можете �е или вратити и пробати да поново уне�ете детаље налога или да "
+#~ "затворите помоћника и додате налоге ка�није из менија „Измени“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Дошло је до грешке"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Да ли имате још неки налог за ћа�кање који желите да поде�ите?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Уне�ите детаље налога"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Који тип налога за ћа�кање желите да направите?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Да ли желите да направите још налога за ћа�кање?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Уне�ите детаље новог налога"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Са Интернет Пи�моношом можете ћа�кати и �а људима у близини и �а "
+#~ "пријатељима и колегама који кори�те Гугл разговор, �ИМ, Виндоуз уживо и "
+#~ "многе друге програме за ћа�кање. Са микрофоном и камером такође можете да "
+#~ "обављате и аудио и видео позиве."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Да ли имате налог који �те кори�тили �а неким другим програмом за ћа�кање?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Да, увези детаље мог налога из "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Да, ја ћу �ам унети детаље налога"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�е, желим нови налог"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�е, за �ада �амо желим да видим људе у близини"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Изаберите налоге које желите да увезете:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�е, то је �ве за �ада"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Измени->�алози"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "За �ада _не желим да кори�тим ову могућно�т"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "�е могу да ћа�кам �а људима повезаним на вашу локалну мрежу јер telepathy-"
+#~ "salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте пакет "
+#~ "telepathy-salut и направите налог „Људи у околини“ из прозорчета „�алози“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut није ин�талиран"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "��и�тент налога за брзе поруке и ВоИП"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Добродошли у Интернет Пи�моношу"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Увезите ваше по�тојеће налоге"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Уне�ите личне податке"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Приказује помоћника налога"
+
+#~ msgid "Call volume"
+#~ msgstr "Јачина звука позива"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Јачина звука позива, у процентима."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Пи�моноша је пребацио дневнике из лептира"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Да ли је Пи�моноша пребацио дневнике из лептира."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Вр�та прикључка није подржана"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Моји веб налози"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "�алог %s је измењен путем %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "�алог %s не може бити уређиван из Пи�моноше."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Покрени Моје веб налоге"
+
+#~ msgid "Edit %s"
+#~ msgstr "Измени %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "По_ништи"
+
+#~ msgid "Personal Information"
+#~ msgstr "Подаци о профилу"
+
+#~ msgid "Ungrouped"
+#~ msgstr "�егрупи�ано"
+
+#~ msgid "Favorite People"
+#~ msgstr "Омиљени људи"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Изм_ени"
+
+#~ msgid "Select a contact"
+#~ msgstr "Изаберите пријатеља"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Повезани пријатељи"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Изаберите пријатеља за повезивање"
+
+#~ msgid "New contact preview"
+#~ msgstr "Преглед новог пријатеља"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Означени пријатељи на �пи�ку лево ће бити увезани заједно."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Повежи контакте…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Повежи пријатеље"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Развежи…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Раздваја увезане контакте у по�ебне пријатеље."
+
+#~ msgid "_Link"
+#~ msgstr "_Увежи"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Да развежем увезаног пријатеља „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Да ли �те �игурни да желите да развежете увезаног пријатеља? Овим ћете "
+#~ "раздвојити увезане контакте у по�ебне пријатеље."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Развежи"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ИБ пријатеља:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ћ_а�кај"
+
+#~ msgid "Send _Video"
+#~ msgstr "Пошаљи _видео"
+
+#~ msgid "C_all"
+#~ msgstr "_Позови"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "По�тавите ваше при�у�тво и тренутно �тање"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Изабрани пријатељ не може да прими датотеке."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Изабрани пријатељ није на вези."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Овим ћете направити нови налог, занемаривши унете измене.\n"
+#~ "Да ли �игурно желите да на�тавите?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Лични _подаци"
+
+#~ msgid "Input level:"
+#~ msgstr "Улазни ниво:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Јачина улазног звука:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Отварај ћа�кања у новим прозорима"
+
 #~ msgid "All"
 #~ msgstr "Све"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 4c3713bbf..d136d7213 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,528 +11,582 @@
 # Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
 # Miloš Popović <gpopac@gmail.com>, 2010.
 # Branko Kokanović <branko.kokanovic@gmail.com>, 2011.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-13 08:42+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
-"ćaskanje"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Internet pismonoša"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Program za brze poruke"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Dopisivanje preko Internet pismonoše"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Program za brze poruke"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"ćaskanje"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za dopisivanje i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljajte nalozima za dopisivanje i VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Uvek otvara poseban prozor za nova ćaskanja."
+msgid "Connection managers should be used"
+msgstr "Da li će biti korišćen upravnik mrežom"
 
+# Nije connect već disconnect!!! ~Miloš
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Ja�ina zvuka poziva"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
+"uspostavljanje veze."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Ja�ina zvuka poziva, u procentima."
+msgid "Empathy should auto-connect on startup"
+msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Uređaj kamerice"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Položaj kamerice"
+msgid "Empathy should auto-away when idle"
+msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
-"(tab) u grupnim ćaskanjima."
+"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema prozora za ćaskanje"
+msgid "Empathy default download folder"
+msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Varijanta teme prozora za ćaskanje"
+msgid "The default folder to save file transfers in."
+msgstr "Podrazumevana fascikla za �uvanje prenesenih datoteka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
-"fr“)."
+"Magi�an broj korišćen za proveru ako zadaci �išćenja ispravnosti treba da "
+"budu pokrenuti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Zbijeni spisak prijatelja"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"„empathy-sanity-cleaning.c“ (�išćenje ispravnosti internet pismonoše) koristi "
+"ovaj broj da proveri da li zadaci �išćenja treba da budu izvršeni ili ne. "
+"Korisnici ne treba ru�no da menjaju ovaj klju�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Da li će biti korišćen upravnik mrežom"
+msgid "Show offline contacts"
+msgstr "Prikazuje prijatelje van mreže"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kriterijum za sortiranje prijatelja"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
-"video0“."
+msgid "Show avatars"
+msgstr "Prikazuje slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za izbor slike"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Isklju�uje iska�uća obaveštenja kada smo odsutni"
+msgid "Show protocols"
+msgstr "Prikazuje protokole"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Onemogućava zvuke kada smo odsutni"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Prikazuje dolazne događaje na liniji stanja"
+msgid "Show Balance in contact list"
+msgstr "Prikazuje gotovinu na spisku prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih "
-"prikazuje korisniku."
+msgid "Whether to show account balances in the contact list."
+msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Podrška za uklanjanje odjeka"
+msgid "Compact contact list"
+msgstr "Zbijeni spisak prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
+msgid "Hide main window"
+msgstr "Sakriva glavni prozor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
+msgid "Hide the main window."
+msgstr "Sakriva glavni prozor programa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
+msgid "Default directory to select an avatar image from"
+msgstr "Podrazumevana fascikla za izbor slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Poslednja fascikla iz koje je izabrana slika."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Pismonoša je prebacio dnevnike iz leptira"
+msgid "Open new chats in separate windows"
+msgstr "Otvara nova ćaskanja u razli�itim prozorima"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
+msgid "Always open a separate chat window for new chats."
+msgstr "Uvek otvara poseban prozor za nova ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
+msgid "Display incoming events in the status area"
+msgstr "Prikazuje dolazne događaje na liniji stanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Da li Pismonoša da umanji preciznost lokacije"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih "
+"prikazuje korisniku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje"
+msgid "The position for the chat window side pane"
+msgstr "Položaj bo�ne površi prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Omogućava Veb kit razvojne alate"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Sa�uvan položaj (u ta�kama) bo�ne površi prozora za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Omogućava iska�uća obaveštenja za nove poruke"
+msgid "Show contact groups"
+msgstr "Prikazuje grupe kontakta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Omogućava proveru pisanja"
+msgid "Whether to show groups in the contact list."
+msgstr "Da li da prikazuje grupe u spisku kontakta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Sakriva glavni prozor"
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Sakriva glavni prozor programa."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
+"koristi „state“ (sortiranje po stanju prijatelja). Ako je vrednost „name“, "
+"sortiranje se vrši po imenu prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Znak za dovršavanje nadimka"
+msgid "Use notification sounds"
+msgstr "Koristi zvukove za obaveštenja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Otvara nova ćaskanja u razli�itim prozorima"
+msgid "Whether to play a sound to notify of events."
+msgstr "Da li da pusti obaveštajni zvuk za događaje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Putanja do Adijum teme za korišćenje"
+msgid "Disable sounds when away"
+msgstr "Onemogućava zvuke kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Pušta zvuk za dolazeće poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Pušta zvuk za nove razgovore"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Pušta zvuk za odlazeće poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Pušta zvuk kada se prijatelj prijavi"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Pušta zvuk kada se prijatelj odjavi"
+msgid "Play a sound for new conversations"
+msgstr "Pušta zvuk za nove razgovore"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Pušta zvuk kada se ja prijavim"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Pušta zvuk kada se ja odjavim"
+msgid "Play a sound when a contact logs in"
+msgstr "Pušta zvuk kada se prijatelj prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
+msgid "Play a sound when a contact logs out"
+msgstr "Pušta zvuk kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Položaj prikaza kamerice za vreme poziva."
+msgid "Play a sound when we log in"
+msgstr "Pušta zvuk kada se ja prijavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Prikazuje gotovinu na spisku prijatelja"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Prikazuje slike"
+msgid "Play a sound when we log out"
+msgstr "Pušta zvuk kada se ja odjavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Prikazuje spisak prijatelja u sobama"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
+msgid "Enable popup notifications for new messages"
+msgstr "Omogućava iska�uća obaveštenja za nove poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Prikazuje prijatelje van mreže"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Da li da prikazuje obla�ić obaveštenja kada primite novu poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Prikazuje protokole"
+msgid "Disable popup notifications when away"
+msgstr "Isklju�uje iska�uća obaveštenja kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Jezici za proveru pisanja"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Da li da prikazuje obla�ić obaveštenja kada ste zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Podrazumevana fascikla za �uvanje prenesenih datoteka."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Poslednja fascikla iz koje je izabrana slika."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Da li da prikazuje obla�ić obaveštenja sa pristiglim porukama �ak i kada je "
+"prozor za ćaskanje otvoren, ali nije u fokusu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Položaj bo�ne površi prozora za ćaskanje"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Sa�uvan položaj (u ta�kama) bo�ne površi prozora za ćaskanje."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Da li da prikazuje obla�ić obaveštenja kada se prijatelj prijavi na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Da li da prikazuje obla�ić obaveštenja kada se prijatelj odjavi sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Prikazuje sli�icu sa smeškom"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Koristi zvukove za obaveštenja"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Da li da prikazuje smeške kao sli�ice unutar razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Koristi teme za sobe ćaskanja"
+msgid "Show contact list in rooms"
+msgstr "Prikazuje spisak prijatelja u sobama"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+msgid "Chat window theme"
+msgstr "Tema prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
+msgid "Chat window theme variant"
+msgstr "Varijanta teme prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
+msgid "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za korišćenje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
+"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
+msgid "Enable WebKit Developer Tools"
+msgstr "Omogućava Veb kit razvojne alate"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor."
 
-# Nije connect već disconnect!!! ~Miloš
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Obaveštava ostale korisnike kada im pišete poruku"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
-"uspostavljanje veze."
+"Da li će da pošalje stanja ćaskanja „sastavlja“ ili „pauziran“. Neće uticati na "
+"stanje „otišao“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Da li da proverava pisanje re�i za izabrane jezike."
+msgid "Use theme for chat rooms"
+msgstr "Koristi teme za sobe ćaskanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Da li da prikazuje smeške kao sli�ice unutar razgovora."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Da li da koristi temu za sobe razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Da li će biti uklju�en filter Pulse audia za uklanjanje odjeka."
+msgid "Spell checking languages"
+msgstr "Jezici za proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
+msgid "Enable spell checker"
+msgstr "Omogućava proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Da li da pusti obaveštajni zvuk za događaje."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Da li da proverava pisanje re�i za izabrane jezike."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
+msgid "Nick completed character"
+msgstr "Znak za dovršavanje nadimka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
+"(tab) u grupnim ćaskanjima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
+msgid "Last account selected in Join Room dialog"
+msgstr "Poslednji izabrani nalog u prozor�etu za pridruživanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Putanja objekta D-basa poslednjeg naloga izabranog za pridruživanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Da li da prikazuje obla�ić obaveštenja kada se prijatelj odjavi sa mreže."
+msgid "Camera device"
+msgstr "Uređaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Da li da prikazuje obla�ić obaveštenja kada se prijatelj prijavi na mrežu."
+"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Da li da prikazuje obla�ić obaveštenja sa pristiglim porukama �ak i kada je "
-"prozor za ćaskanje otvoren, ali nije u fokusu."
+msgid "Camera position"
+msgstr "Položaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Da li da prikazuje obla�ić obaveštenja kada primite novu poruku."
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj prikaza kamerice za vreme poziva."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
+msgid "Echo cancellation support"
+msgstr "Podrška za uklanjanje odjeka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Da li će biti uklju�en filter Pulse audia za uklanjanje odjeka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
+msgid "Show hint about closing the main window"
+msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Da li da prikazuje obla�ić obaveštenja kada ste zauzeti ili odsutni."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
+"„x“ dugme."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+msgid "Empathy can publish the user's location"
+msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
+msgid "Empathy can use the network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
-"„x“ dugme."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Da li da koristi temu za sobe razgovora."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Da li Pismonoša da umanji preciznost lokacije"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
-"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, "
-"sortiranje se vrši po stanju prijatelja."
+"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljajte nalozima za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nije naveden razlog"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Nalozi za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Zahtevana je promena stanja"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Obustavili ste prenos datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Druga strana je prekinula prenos datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Greška prilikom prenosa datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strana nije u mogućnosti da prenese datoteku"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je završen, ali je datoteka oštećena"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Druga strana ne podržava prenos datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izabrana datoteka nije obi�na datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izabrana datoteka je prazna"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Propušten poziv od %s"
@@ -548,169 +602,138 @@ msgstr "Poziv korisnika %s"
 msgid "Call from %s"
 msgstr "Poziv od %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Vrsta priklju�ka nije podržana"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nije naveden razlog"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zahtevana je promena stanja"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Obustavili ste prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Druga strana je prekinula prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Greška prilikom prenosa datoteke"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strana nije u mogućnosti da prenese datoteku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Greška u mreži"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Neuspešna prijava"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Greška pri šifrovanju"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je u upotrebi"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat nije prosleđen"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Sertifikat nije od poverenja"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat je istekao"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat nije aktiviran"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Ime domaćina sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Sertifikat je samopotpisan"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Greška u sertifikatu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Å ifrovanje nije dostupno"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikat nije ispravan"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Veza ne može da se uspostavi"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ovaj resurs je već povezan sa serverom"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Ovaj nalog je već povezan sa serverom"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Veza je zamenjena novom vezom koristeći isti resurs"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previše zauzet da bi uspostavio vezu"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikat je opozvan"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat koristi nebezbedni algoritam Å¡ifrovanja ili je kriptografski slab"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,42 +741,49 @@ msgstr ""
 "Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje "
 "granice biblioteke za Å¡ifrovanje"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Vaš softver je previše star"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Unutrašnja greška"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Jahu! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Gugl razgovor"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Fejsbuk ćaskanje"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Pre %d sekunde"
+msgstr[0] "Pre %d sekund"
 msgstr[1] "Pre %d sekunde"
 msgstr[2] "Pre %d sekundi"
 msgstr[3] "Pre jedne sekunde"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Pre %d minuta"
+msgstr[0] "Pre %d minut"
 msgstr[1] "Pre %d minuta"
 msgstr[2] "Pre %d minuta"
 msgstr[3] "Pre jednog minuta"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +792,7 @@ msgstr[1] "Pre %d sata"
 msgstr[2] "Pre %d sati"
 msgstr[3] "Pre jednog sata"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +801,7 @@ msgstr[1] "Pre %d dana"
 msgstr[2] "Pre %d dana"
 msgstr[3] "Pre jednog dana"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +810,7 @@ msgstr[1] "Pre %d nedelje"
 msgstr[2] "Pre %d nedelja"
 msgstr[3] "Pre jedne nedelje"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +819,211 @@ msgstr[1] "Pre %d meseca"
 msgstr[2] "Pre %d meseci"
 msgstr[3] "Pre jednog meseca"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "u budućnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Lozinka nije pronađena"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Lozinka TP naloga za %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Lozinka za pri�aonicu „%s“ na nalogu %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Svi nalozi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Moji veb nalozi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Nalog %s je izmenjen putem %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Pokreni Moje veb naloge"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Izmeni %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Primeni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Prijavi _me"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Napravi novi nalog na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "Po_ništi"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Novi nalog"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> MojNadimak"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Lozinka:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "_Nadimak:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamti lozinku"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamti lozinku"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nadimak:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Koja je vaša AIM lozinka?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Koji je vaš AIM nadimak?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Koja je vaša AIM lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> korisni�ko_ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisni�ko_ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Koji je vaš Group Vajz korisni�ki IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Koja je vaša Group Vajz lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICKu _KIB:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Kodni r_aspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICKu _KIB:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Koji je vaš ICKu KIB?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Koja je vaša ICKu lozinka?"
 
@@ -1043,11 +1060,23 @@ msgstr "Opcije"
 msgid "None"
 msgstr "Ništa"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Mreža"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Mreža:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Kodni raspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serveri"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1084,6 @@ msgstr ""
 "Većina IRC servera ne traži lozinku, zato ako niste sigurni, nemojte je "
 "unositi."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Mreža"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Mreža:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nadimak:"
@@ -1079,48 +1100,20 @@ msgstr "Poruka za kraj:"
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serveri"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Koji je vaš IRC nadimak?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Koja IRC mreža?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Primer:</b> korisnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Primer:</b> korisnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Zahteva se _Å¡ifrovanje(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Zanemari greške SSL sertifikata"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Prevaziđi postavke servera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Prioritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Koji je vaš IRC nadimak?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Koje je vaše Fejsbuk korisni�ko ime?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1125,203 @@ msgstr ""
 "Ukoliko nemate korisni�ko ime za Fejsbuk, idite na <a href=\"http://www."
 "facebook.com/username/\">ovu stranu</a> da ga izaberete."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Koristi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Koja je vaša Fejsbuk lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Koje je vaše Fejsbuk korisni�ko ime?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Koji je vaš Gugl IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Koja je vaša Gugl lozinka?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Zanemari greške SSL sertifikata"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Zahteva se _Å¡ifrovanje(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Koristi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Prevaziđi postavke servera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Koji je vaš Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Koja je vaša Džaber lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Koji je vaš željeni Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Koja je vaša Džaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Koja ja vaša željena Džaber lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Primer:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Koji je vaš Vindouz Uživo IB ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Koja je vaša Vindouz Uživo lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adresa _e-pošte:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Prezime:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Ime za _objavu:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Džaber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Prezime:"
+msgid "E-_mail address:"
+msgstr "Adresa _e-pošte:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Ime za _objavu:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Primer:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Korisni�ko ime za prijavu:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Otkrij povezivanja"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrij STUN server"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Zanemari TLS greške"
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Period (u sekundama)"
+msgid "Proxy Options"
+msgstr "Opcije posrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcije za održavanje stalne veze"
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Slabo rutiranje"
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizam:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrij STUN server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Razne opcije"
+msgid "Discover Binding"
+msgstr "Otkrij povezivanja"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcije prolaska kroz NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcije za održavanje stalne veze"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mehanizam:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcije posrednika"
+msgid "Interval (seconds)"
+msgstr "Period (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Korisni�ko ime za prijavu:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Zanemari TLS greške"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Koja je lozinka za vaš SIP nalog?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Korisni�ko ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Koja je lozinka za vaš SIP nalog?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Jahu! I_B:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Zanemari pozivnice za pri�aonice i konferencije"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lok_alni spisak soba:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Koji je vaš Jahu! IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Koja je vaša Jahu! lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Jahu! I_B:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lok_alni spisak soba:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1342,84 +1359,88 @@ msgstr "Sve datoteke"
 msgid "Click to enlarge"
 msgstr "Kliknite da uvećate"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Došlo je do greške prilikom pozivanja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Navedeni kontakt ne podržava pozive"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Navedeni kontakt nije na vezi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Navedeni kontakt nije ispravan"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Ovaj protokol ne podržava hitne pozive"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Nemate dovoljno kredita da biste mogli da obavite ovaj poziv"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Nisam uspeo da otvorim privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Teme nisu podržane u ovom razgovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Nije vam dozvoljeno da promenite temu"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ nije ispravan IB kontakta"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �isti sve poruke iz ovog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <IB sobe>: priklju�uje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <IB sobe>: priklju�uje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<IB sobe>] [<razlog>]: napušta sobu za ćaskanje, podrazumevano trenutnu"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <poruka>: Å¡alje poruku RADNJA na trenutni razgovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1450,11 @@ msgstr ""
 "poruka koje po�inju sa „/“. Na primer: „/say /join se koristi za priklju�ivanje "
 "u novu sobu za ćaskanje“"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <IB kontakta>: prikazuje podatke o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1462,126 @@ msgstr ""
 "/help [<komanda>]: prikazuje sve podržane naredbe. Ako se da i konkretna "
 "<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Korišćenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nema dovoljno gotovine za slanje poruke"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Greška pri slanju poruke „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Greška pri slanju poruke: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "nema dovoljno gotovine za slanje poruke. <a href='%s'>Dopunite</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "nesposoban"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Greška pri slanju poruke „%s“: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Greška pri slanju poruke: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Temu je postavio %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj „%s“ u re�nik"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj „%s“ u re�nik za %s jezik"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Pošalji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Nisam uspeo da preuzmem skorašnje dnevnike"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otišao sa veze"
@@ -1555,12 +1589,12 @@ msgstr "%s je otišao sa veze"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izbacio korisnika %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izba�en"
@@ -1568,17 +1602,17 @@ msgstr "%s je izba�en"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je zabranio pristup korisniku %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pri�aonicu"
@@ -1588,17 +1622,17 @@ msgstr "%s je napustio(la) pri�aonicu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je pristupio(la) pri�aonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
@@ -1606,90 +1640,90 @@ msgstr "%s je sada poznat kao %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Da li želite da zapamtite ovu lozinku?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Pogrešna lozinka, pokušajte ponovo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ova soba je zaštićena lozinkom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Priklju�i se"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Razgovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nepoznati ili neispravan identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje prijatelja je trenutno nedostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje prijatelja nije dostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ne mogu da blokiram prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Izmeni blokirane prijatelje"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Nalog:"
 
@@ -1699,63 +1733,54 @@ msgstr "Blokirani prijatelji"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ukloni"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Umnoži adresu veze"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otvori vezu"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Izmeni podatke kontakta"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Podaci o profilu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokirati %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
@@ -1764,401 +1789,315 @@ msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Od_lu�i kasnije"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokiraj korisnika"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupisano"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Omiljeni ljudi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Uklanjam grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Uklanjam prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Dod_aj prijatelja…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokiraj kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ća_skanje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Prethodni razgovori"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Pošalji datoteku"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Podeli moju radnu površ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Omiljeni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Podaci"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Izm_eni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Pozivam vas u ovu sobu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Pozov_i u sobu za ćaskanje"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Od_lu�i kasnije"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Pretraži kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pretraga:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nije pronađen nijedan prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Poruka koja vas predstavlja:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Molim vas obavestite ne kada ste na mreži. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izaberite prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Puno ime:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Broj telefona:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adresa e-pošte:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Veb stranica:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Rođendan:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viđen pre:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Povezan sa:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poruka za odsutnost:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO kod države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Poštanski kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivo ta�nosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Uspravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vodoravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Poslednji put ažurirano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Geografska dužina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Geografska Å¡irina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Lokacija"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Sa�uvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ne mogu da sa�uvam sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Lokacija</b> u (datum)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nadimak:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podaci o klijentu"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Program:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Li�ni podaci"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalji o prijatelju"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Ime i prezime"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Broj telefona"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Adresa el. pošte"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Veb stranica"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Rođendan"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Viđen pre:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Povezan sa:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Poruka za odsutnost:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "posao"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "kuća"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobilni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "glasovni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "prvenstveni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "poštanski"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pošiljka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nadimak:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lokacija</b> u (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Zahtevani su podaci…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Podaci o klijentu"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Izdanje:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Program:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2105,21 @@ msgstr ""
 "Izaberite grupe u kojima želite da se prijatelj nalazi.  Primetite da možete "
 "da odaberete i više grupa kao i nijednu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Dod_aj grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sledeći identitet će biti blokiran:"
@@ -2188,7 +2127,7 @@ msgstr[1] "Sledeći identiteti će biti blokirani:"
 msgstr[2] "Sledeći identiteti će biti blokirani:"
 msgstr[3] "Sledeći identitet će biti blokiran:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sledeći identitet ne može biti blokiran:"
@@ -2196,79 +2135,144 @@ msgstr[1] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[2] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[3] "Sledeći identitet ne može biti blokiran:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani prijatelji"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izaberite prijatelja za povezivanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Pregled novog prijatelja"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani zajedno."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Izmeni podatke kontakta"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izaberite nalog koji će biti korišćen za poziv"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Posao"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "KUĆA"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokiraj kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "Ća_skanje"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Prethodni razgovori"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Pošalji datoteku"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Podeli moju radnu površ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Omiljeni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "program gnomovi kontakti nije instaliran"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Podaci"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Poveži kontakte…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Pozov_i u sobu za ćaskanje"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Dod_aj prijatelja…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Izbriši i _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Uklanjam grupu"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2281,11 @@ msgstr ""
 "Da li stvarno želite da uklonite uvezani kontakt „%s“? Ovo će ukloniti i sve "
 "kontakte koji su vezani za ovaj kontakt."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Uklanjam prijatelja"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2298,23 @@ msgstr[3] "Uvezani prijatelj sadrži jedan kontakt"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Lokacija</b> u (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Na vezi preko telefona ili mobilnog uređaja"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova mreža"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Odaberite IRC mrežu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Resetuj _mrežni spisak"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Izaberi"
@@ -2319,91 +2327,48 @@ msgstr "novi server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Poveži prijatelje"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Razveži…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Uveži"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Da razvežem uvezanog prijatelja „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
-"razdvojiti uvezane kontakte u posebne prijatelje."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Razveži"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Istorijat"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Prikaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Potraži"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Ćaskanje u %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Ćaskanje sa %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2377,7 @@ msgstr[1] "%s sekunde"
 msgstr[2] "%s sekundi"
 msgstr[3] "jedne sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2386,197 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuta"
 msgstr[3] "jednog minuta"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Poziv je zapo�et %s, a završen je %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Danas"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ju�e"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Bilo kad"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Bilo Å¡ta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Pisana ćaskanja"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Dolazni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Odlazeći pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Propušteni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Å ta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Da li ste sigurni da želite da obrišete sve dnevnike prethodnih razgovora?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "O�isti sve"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Obriši od:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">U�itavam...</span>"
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ćaskanje"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "Izm_eni"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Obriši sav istorijat..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Ćaskanje"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Izm_eni"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "strana 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "IB prijatelja:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">U�itavam...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ć_askaj"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakt nije na vezi"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Navedeni kontakt ili je neispravan ili nepoznat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt ne podržava ovu vrstu razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Zahtevana funkcionalnost nije primenjena za ovaj protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne mogu da zapo�nem razgovor sa datim kontaktom"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Izba�eni ste sa ovog kanala"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ovaj kanal je pun"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Morate biti pozvani da se pridružite ovom kanalu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ne mogu da nastavim dok je veza prekinuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Došlo je do greške prilikom zapo�injanja razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "Unesite odrednik kontakta ili telefonski broj:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Pošalji _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video poziv"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Pozovi"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio poziv"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Novi poziv"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Nije uspelo potvrđivanje identiteta za nalog <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2602,12 +2613,8 @@ msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu"
 msgid "Set status"
 msgstr "Postavi stanje"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Postavite vaše prisustvo i trenutno stanje"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Proizvoljne poruke…"
 
@@ -2615,7 +2622,7 @@ msgstr "Proizvoljne poruke…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Novi %s nalog"
@@ -2625,20 +2632,20 @@ msgid "Find:"
 msgstr "Traži:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Uporedi veli�inu slova"
+msgid "_Previous"
+msgstr "_Prethodno"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Izraz nije pronađen"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Sledeće"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Uporedi veli�inu slova"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Prethodno"
+msgid "Phrase not found"
+msgstr "Izraz nije pronađen"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2691,12 @@ msgstr "Poziv za razgovor je završen"
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Poruka je uređena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normalno"
 
@@ -2766,34 +2773,38 @@ msgid "Certificate hostname: %s"
 msgstr "Ime domaćina sertifikata: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Nastavi"
+msgid "C_ontinue"
+msgstr "_Nastavi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepoverljiva veza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ova veza nije od poverenja. Želite li ipak da nastavite?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamti ovaj izbor za naredne veze"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalji sertifikata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Ne mogu da otvorim adresu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Nema dovoljno slobodnog mesta za �uvanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2813,7 @@ msgstr ""
 "Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite "
 "drugo mesto za snimanje."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Dolazeća datoteka od %s"
@@ -2974,40 +2985,32 @@ msgstr "zapadni"
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Izabrani prijatelj ne može da primi datoteke."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Izabrani prijatelj nije na vezi."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nema poruka o greškama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Brza poruka (Pismonoša)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne prikazuj spisak prijatelja niti bilo koje drugo prozor�e po pokretanju"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— Internet pismonoša za brze poruke"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Greška pri komunikaciji sa Upravnikom naloga"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3058,11 @@ msgstr ""
 "adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Danilo Å egan <dsegan@gmx.net>\n"
@@ -3071,222 +3074,83 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Greška pri uvoženju naloga."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Greška pri obradi detalja naloga."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Greška pri pravljenju naloga."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Dogodila se greška."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Ispisana poruka greške: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
-"zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Koji tip naloga za ćaskanje imate?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Unesite detalje naloga"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Koji tip naloga za ćaskanje želite da napravite?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Da li želite da napravite još naloga za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Unesite detalje novog naloga"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa prijateljima "
-"i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i mnoge druge "
-"programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
-"audio i video pozive."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Da, uvezi detalje mog naloga iz "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Da, ja ću sam uneti detalje naloga"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ne, želim novi nalog"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, za sada samo želim da vidim ljude u blizini"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Izaberite naloge koje želite da uvezete:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ne, to je sve za sada"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
-"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
-"su detalji ispod ta�ni. Lako ih možete izmeniti kasnije ili isklju�iti ovu "
-"mogućnost iz prozor�eta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Izmeni->Nalozi"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Za sada _ne želim da koristim ovu mogućnost"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
-"salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
-"telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut nije instaliran"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistent naloga za brze poruke i VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Dobrodošli u Internet Pismonošu"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Uvezite vaše postojeće naloge"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Unesite li�ne podatke"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Postoje nesa�uvane izmene na vašem nalogu %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Vaš novi nalog još nije sa�uvan."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nepovezan — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Veza je prekinuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nepovezan — Nema mrežne konekcije"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Ovaj nalog je isklju�en zato što se zasniva na starom, nepodržanom pozadincu. "
+"Instalirajte „telepathy-haze“ i ponovo pokrenite vašu sesiju da premestite "
+"nalog."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Nepovezan — Nalog je onemogućen"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
-"Da li sigurno želite da nastavite?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Uredite parametre povezivanja"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Nisam uspeo da dovu�em vaše li�ne podatke sa servera."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Uspostavite vezu da uredite vaše li�ne podatke."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Uredi parametre povezivanja..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg ra�unara?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ovo neće ukloniti vaš nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3159,23 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "O_nemogući"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Presko�i"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Poveži se"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3187,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "U�itavam podatke o nalogu"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nijedan protokol nije instaliran"
+msgid "_Import…"
+msgstr "_Uvezi…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Loading account information"
+msgstr "U�itavam podatke o nalogu"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3203,132 @@ msgstr ""
 "Da dodate novi nalog, prvo morate da instalirate priklju�ke za sve protokole "
 "koje želite da koristite."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Uvezi…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Nisu instalirani pozadinci protokola"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Ljudi u okolini"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Osvetljenost"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Ja�ina zvuka"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Bo�na površ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Zvu�ni ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Broj�anik"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalji"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Poziv sa korisnikom %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP adresa kako je vidi ovaj ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adresa kako je vidi server na internetu"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adresa vršnjaka kako je vidi druga strana"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP adresa relejnog servera"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP adresa grupe za višestruko emitovanje"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehni�ki detalji"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan zvu�ni format koji podržava vaš ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan video format koji podržava vaš ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3337,27 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
 "ne dozvoljava direktne veze."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Došlo je do greške u mreži"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Zvu�ni formati potrebni za ovaj poziv nisu instalirani na vašem ra�unaru"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formati potrebni za ovaj poziv nisu instalirani na vašem ra�unaru"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3368,216 @@ msgstr ""
 "\">ovu grešku</a> i prika�ite dnevnike pokupljene iz prozora „Otklanjanje "
 "grešaka“ u meniju „Pomoć“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Došlo je do greške u motoru za pozive"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Dostignut je kraj toka"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ne mogu da uspostavim zvu�ni tok"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ne mogu da uspostavim video tok"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Pozovi"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek za dekodiranje:"
+msgid "_Microphone"
+msgstr "Mi_krofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Isklju�ite kamericu"
+msgid "_Camera"
+msgstr "_Kamerica"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Prikažite broj�anik"
+msgid "_Settings"
+msgstr "Po_dešavanja"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek za kodiranje:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "Pre_gled"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Prekini"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Po_moć"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Prekinite trenutni poziv"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Sadržaj"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalni kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Otklanjanje _grešaka"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Uvećaj me"
+msgid "Swap camera"
+msgstr "Razmeni kameru"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Umanji me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Udaljeni kandidat:"
+msgid "Maximise me"
+msgstr "Uvećaj me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Pošalji zvuk"
+msgid "Disable camera"
+msgstr "Isklju�ite kamericu"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Pošalji video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Prekini"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Prikaži broj�anik"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Prekinite trenutni poziv"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video poziv"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Zapo�nite video poziv"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Zapo�nite audio poziv"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Razmeni kameru"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Uklju�i/isklju�i prenos zvuka"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Uklju�i/isklju�i prenos videa"
+msgid "Show dialpad"
+msgstr "Prikaži broj�anik"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nepoznato"
+msgid "Display the dialpad"
+msgstr "Prikažite broj�anik"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Pošalji video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video poziv"
+msgid "Toggle video transmission"
+msgstr "Uklju�i/isklju�i prenos videa"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Pozovi"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Pošalji zvuk"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamerica"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sadržaj"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Uklju�i/isklju�i prenos zvuka"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Otklanjanje _grešaka"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek za kodiranje:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Po_moć"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Mi_krofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Po_dešavanja"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Pre_gled"
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Da zatvorim ovaj prozor?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Zatvaranjem ovog prozora biće napušteno %s. Nećete primati nikakve buduće "
+"poruke sve dok se ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Zatvaranjem ovog prozora biće napuštena %u soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[1] ""
+"Zatvaranjem ovog prozora biće napuštene %u sobe za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[2] ""
+"Zatvaranjem ovog prozora biće napušteno %u soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[3] ""
+"Zatvaranjem ovog prozora biće napuštena jedna soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Da napustim %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Nećete primati nikakve buduće poruke iz ove sobe za ćaskanje sve dok joj se "
+"ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zatvori prozor"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Napusti sobu"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3586,7 @@ msgstr[1] "%s (%d nepro�itane)"
 msgstr[2] "%s (%d nepro�itanih)"
 msgstr[3] "%s (jedna nepro�itana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3595,7 @@ msgstr[1] "%s (i %u druge)"
 msgstr[2] "%s (i %u drugih)"
 msgstr[3] "%s (i jedna druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3604,7 @@ msgstr[1] "%s (%d nepro�itane od ostalih)"
 msgstr[2] "%s (%d nepro�itanih od ostalih)"
 msgstr[3] "%s (jedna nepro�itana od ostalih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3613,11 @@ msgstr[1] "%s (%d nepro�itane od svih)"
 msgstr[2] "%s (%d nepro�itanih od svih)"
 msgstr[3] "%s (jedna nepro�itana od svih)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3626,69 @@ msgstr[1] "Å aljem %d poruke."
 msgstr[2] "Å aljem %d poruka."
 msgstr[3] "Å aljem jednu poruku"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Piše poruku."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_O�isti"
+msgid "_Conversation"
+msgstr "_Razgovor"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Prijatelj"
+msgid "C_lear"
+msgstr "_O�isti"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ubaci _smešak"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Omiljena soba za _ćaskanje"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Pozovi _u�esnike…"
+msgid "Notify for All Messages"
+msgstr "Obavesti za sve poruke"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Premesti jezi�ak _levo"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Prikaži _spisak prijatelja"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Premesti jezi�ak _desno"
+msgid "Invite _Participant…"
+msgstr "Pozovi _u�esnike…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Obavesti za sve poruke"
+msgid "C_ontact"
+msgstr "_Prijatelj"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Razgovor"
+msgid "_Tabs"
+msgstr "_Listovi"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Otka�i list"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Omiljena soba za _ćaskanje"
+msgid "_Previous Tab"
+msgstr "_Prethodni list"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Sledeći list"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Prethodni list"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Opozovi zatvaranje jezi�ka"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Prikaži _spisak prijatelja"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Premesti jezi�ak _levo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Listovi"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Premesti jezi�ak _desno"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Opozovi zatvaranje jezi�ka"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Otka�i list"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3702,100 @@ msgstr "Soba"
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Dolazni video poziv"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas zove video pozivom. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas zove. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dolazni poziv od %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Odgovori sa _videom"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dolazni video poziv od %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozivnica da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Priklju�i se"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Pozvani ste da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Zahtevana je lozinka"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traži odobrenje da vidi kada ste na vezi"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3805,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Šaljem „%s“ za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Greška pri primanju „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Greška pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Greška pri slanju datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ je primljen od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke je završen"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "ÄŒekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -4008,7 +3915,11 @@ msgstr "Prenosi datoteka"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka sa spiska"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Uvezi"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3927,198 @@ msgstr ""
 "Nisam pronašao nijedan nalog za uvoz. Internet pismonoša trenutno podržava "
 "samo uvoženje naloga iz Pidžina."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Veza je prekinuta"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Morate da podesite nalog da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nema poklapanja"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Izvinite, %s nalozi ne mogu biti korišćeni sve dok ne ažurirate vaš %s "
+"softver."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Ažuriraj softver..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ponovo se poveži"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zatvori"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Dopuni %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Dopunite kredit naloga"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Dopuni..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Morate da uklju�ite jedan od vaših naloga da biste ovde videli kontakte."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Morate da uklju�ite %s da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Prijatelji na _mapi"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Podešavanja naloga"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Iznos gotovine"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Pronađi u _spisku prijatelja"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Novi _poziv…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pridruži se _omiljenim"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Traži prijatelje…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi omiljene"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormalna veli�ina"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nep_ovezani prijatelji"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Novi _poziv…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Prikaži _protokole"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normalna veli�ina sa _avatarima"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Iznos gotovine"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Prijatelji na _mapi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "N_alozi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blokirani prijatelji"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Postavke"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Prikaži _protokole"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Pronađi u _spisku prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Poređaj prema _imenu"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Poređaj prema _stanju"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "N_alozi"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normalna veli�ina sa _avatarima"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokirani prijatelji"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormalna veli�ina"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompaktna veli�ina"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Prenosi _datoteka"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Soba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Priklju�i se…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Novi razgovor…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nep_ovezani prijatelji"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Li�ni _podaci"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Soba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Pridruži se _omiljenim"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Traži prijatelje…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Uredi omiljene"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Soba za ćaskanje"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ÄŒlanovi"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4131,27 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "ÄŒlanovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne mogu da zaustavim listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne mogu da u�itam spisak soba"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pridruži se sobi"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4160,10 @@ msgstr ""
 "Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba na spisku."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Soba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,505 +4171,829 @@ msgstr ""
 "Unesite server koji ugošćava sobe, ili ostavite prazno ako su sobe na "
 "serveru na kojem vam je nalog"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pridruži se sobi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne mogu da u�itam spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Soba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Paja"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Jare"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Jao, kume, gotov sam!! Ja sam bivši �ovek!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Pajo, Å¡ta je bilo, Pajooo??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Kako šta je bilo?? Nema je više, ukrali su mi je!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Å ta su ti ukrali, Pajo?? Å taaaa??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Kako šta?? Ama lađu, ukrali su mi lađu!! Jao meni!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Sav o�ajan, Paja je prekinuo vezu."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Postavke"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Prikaži slike _smešaka"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Prikaži spisak _prijatelja u sobama"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izgled"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Ponašanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Zapo�ni ćaskanja u:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema ćaskanja:"
+msgid "new ta_bs"
+msgstr "novim _jezi�cima"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Isklju�i obaveštenja kada sam _odsutan ili zauzet"
+msgid "new _windows"
+msgstr "novim _prozorima"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Isklju�i zvuke kada sam _odsutan ili zauzet"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaži dolazne događaje u obaveštajnoj zoni"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Sam se poveži nakon pokretanja"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Uklanjanje odjeka �ini da vaš glas drugoj osobi zvu�i jasnije, ali može da "
-"izazove probleme na nekim ra�unarima. Ako vi ili vaš sagovornik �ujete �udne "
-"šumove ili kr�anje za vreme poziva, pokušajte da isklju�ite uklanjanje odjeka i "
-"ponovo pokrenite poziv."
+msgid "Log conversations"
+msgstr "Zabeleži razgovore"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
+msgid "Behavior"
+msgstr "Ponašanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+msgid "General"
+msgstr "Opšte"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
+msgid "_Enable bubble notifications"
+msgstr "_Omogući obaveštenja u obla�ićima"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Omogući proveru pravopisa za sledeće jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "Isklju�i obaveštenja kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Opšte"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ulazni nivo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Ja�ina ulaznog zvuka:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Izvori lokacija:"
+msgid "_Enable sound notifications"
+msgstr "Omogući _zvu�na obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Zabeleži razgovore"
+msgid "Disable sounds when _away or busy"
+msgstr "Isklju�i zvuke kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Pusti zvuk za događaje"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Zvuci"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privatnost"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Koristi uklanjanje _odjeka da poboljšaš kvalitet poziva"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Umanjena ta�nost lokacije zna�i da će najta�niji objavljeni podaci o vašoj "
-"lokaciji biti grad i država.  GPS koordinate će biti ta�ne do 1. decimale."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Prikaži slike _smešaka"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Prikaži spisak _prijatelja u sobama"
+"Uklanjanje odjeka �ini da vaš glas drugoj osobi zvu�i jasnije, ali može da "
+"izazove probleme na nekim ra�unarima. Ako vi ili vaš sagovornik �ujete �udne "
+"šumove ili kr�anje za vreme poziva, pokušajte da isklju�ite uklanjanje odjeka i "
+"ponovo pokrenite poziv."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Zvuci"
+msgid "_Publish location to my contacts"
+msgstr "Objavi lokaciju mojim _prijateljima"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Provera pisanja"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
-"re�nike."
+"Umanjena ta�nost lokacije zna�i da će najta�niji objavljeni podaci o vašoj "
+"lokaciji biti grad i država.  GPS koordinate će biti ta�ne do 1. decimale."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Teme"
+msgid "_Reduce location accuracy"
+msgstr "Umanji _ta�nost lokacije"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Varijanta:"
+msgid "Privacy"
+msgstr "Privatnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Sam se poveži nakon pokretanja"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Omogući obaveštenja u obla�ićima"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Mreža (IP, beži�na)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Omogući _zvu�na obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Mreža (IP, beži�na)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
+"re�nike."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Otvaraj ćaskanja u novim prozorima"
+msgid "Enable spell checking for languages:"
+msgstr "Omogući proveru pravopisa za sledeće jezike:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Objavi lokaciju mojim _prijateljima"
+msgid "Spell Checking"
+msgstr "Provera pisanja"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Tema ćaskanja:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Umanji _ta�nost lokacije"
+msgid "Variant:"
+msgstr "Varijanta:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Pozovi prijatelja ponovo"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Isklj. kameru"
+msgid "Redial"
+msgstr "Ponovo zovi"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Uklj. kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Isklj. video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogući kameru i prestani da šalješ video"
+msgid "Video Preview"
+msgstr "Pregled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogući kameru i šalji video"
+msgid "Video On"
+msgstr "Uklj. video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogući kameru, ali ne šalji video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pregled"
+msgid "Camera Off"
+msgstr "Isklj. kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovo zovi"
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pregled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Isklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Uklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Uklj. kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Pregled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mapa prijatelja"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Sa�uvaj"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Veza kante odlaganja"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odgovor kante odlaganja"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Podaci su preveliki za jedno odlaganje. Sa�uvajte zapisnike u datoteku."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Prozor za otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pošalji u kantu odlaganja"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "Nivo: "
+msgstr "Nivo "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informacije"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kriti�an"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domen"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivo"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Izabrani upravnik veze ne podržava proširenje za udaljeno otklanjanje grešaka."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Pozovi u�esnike"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Pozovi"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ne prikazuj nijedno prozor�e; uradi posao koji imaš (npr. uvoženje) i izađi"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ne prikazuj nijedno prozor�e osim ako ne postoje samo nalozi „Ljudi u blizini“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Po�etno izabiranje datog naloga (npr. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<identifikacija naloga>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Nalozi Pismonoše"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Nalozi Pismonoše"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Prikaži posebnu uslugu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Pismonoša program za ćaskanje"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Odbaci"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Javi se"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odgovori sa videom"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Prihvati"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Obezbedi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je pokušao da vas zove, ali ste vi bili na drugoj vezi."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Na �ekanju"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Vaše trenutno stanje je %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Izvinite, ali nemate dovoljno kredita za ovaj poziv."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Dopuni"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uporedi veli�inu slova"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Koji tip naloga za ćaskanje imate?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodajem novi nalog"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Ljudi u okolini"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
+"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
+"su detalji ispod ta�ni."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Možete kasnije da izmenite te detalje ili da isklju�ite ovu mogućnost tako što "
+"ćete izabrati <span style=\"italic\">Uredi → Nalozi</span> sa spiska "
+"kontakata."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Greška pri uvoženju naloga."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Greška pri obradi detalja naloga."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Greška pri pravljenju naloga."
+
+#~ msgid "There was an error."
+#~ msgstr "Dogodila se greška."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Ispisana poruka greške: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
+#~ "zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Došlo je do greške"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Unesite detalje naloga"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Koji tip naloga za ćaskanje želite da napravite?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Da li želite da napravite još naloga za ćaskanje?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Unesite detalje novog naloga"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa "
+#~ "prijateljima i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i "
+#~ "mnoge druge programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da "
+#~ "obavljate i audio i video pozive."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Da, uvezi detalje mog naloga iz "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Da, ja ću sam uneti detalje naloga"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, želim novi nalog"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ne, za sada samo želim da vidim ljude u blizini"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izaberite naloge koje želite da uvezete:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, to je sve za sada"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Izmeni->Nalozi"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Za sada _ne želim da koristim ovu mogućnost"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
+#~ "salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
+#~ "telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut nije instaliran"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistent naloga za brze poruke i VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Dobrodošli u Internet Pismonošu"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Uvezite vaše postojeće naloge"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Unesite li�ne podatke"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Prikazuje pomoćnika naloga"
+
+#~ msgid "Call volume"
+#~ msgstr "Ja�ina zvuka poziva"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Ja�ina zvuka poziva, u procentima."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Pismonoša je prebacio dnevnike iz leptira"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Vrsta priklju�ka nije podržana"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Moji veb nalozi"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Nalog %s je izmenjen putem %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Pokreni Moje veb naloge"
+
+#~ msgid "Edit %s"
+#~ msgstr "Izmeni %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Po_ništi"
+
+#~ msgid "Personal Information"
+#~ msgstr "Podaci o profilu"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupisano"
+
+#~ msgid "Favorite People"
+#~ msgstr "Omiljeni ljudi"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Izm_eni"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izaberite prijatelja"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani prijatelji"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izaberite prijatelja za povezivanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Pregled novog prijatelja"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani zajedno."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Poveži kontakte…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Poveži prijatelje"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Razveži…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
+
+#~ msgid "_Link"
+#~ msgstr "_Uveži"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Da razvežem uvezanog prijatelja „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
+#~ "razdvojiti uvezane kontakte u posebne prijatelje."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Razveži"
+
+#~ msgid "Contact ID:"
+#~ msgstr "IB prijatelja:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ć_askaj"
+
+#~ msgid "Send _Video"
+#~ msgstr "Pošalji _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Pozovi"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Postavite vaše prisustvo i trenutno stanje"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izabrani prijatelj ne može da primi datoteke."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izabrani prijatelj nije na vezi."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
+#~ "Da li sigurno želite da nastavite?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Li�ni _podaci"
+
+#~ msgid "Input level:"
+#~ msgstr "Ulazni nivo:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Ja�ina ulaznog zvuka:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Otvaraj ćaskanja u novim prozorima"
+
 #~ msgid "All"
 #~ msgstr "Sve"
 
diff --git a/po/sv.po b/po/sv.po
index c3dc9f9ed..0841c9c33 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-18 12:37+0100\n"
-"PO-Revision-Date: 2012-01-18 12:42+0100\n"
+"POT-Creation-Date: 2012-02-19 00:52+0100\n"
+"PO-Revision-Date: 2012-02-19 00:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -21,434 +21,451 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Snabbmeddelandeklient"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Meddelandeklienten Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Snabbmeddelandeklient"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Meddelande och VoIP-konton"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Hantera konton för meddelanden och VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Öppna alltid ett separat fönster för nya chattar."
+msgid "Connection managers should be used"
+msgstr "Anslutningshanterare ska användas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Kameraenhet"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Kameraposition"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Chattfönstertema"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Temavariant för chattfönster"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
+msgid "Empathy default download folder"
+msgstr "Standardhämtningsmapp för Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Kompakt kontaktlista"
+msgid "The default folder to save file transfers in."
+msgstr "Standardmappen att spara filöverföringar i."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Anslutningshanterare ska användas"
+msgid "Show offline contacts"
+msgstr "Visa frånkopplade kontakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Sorteringskriteria för kontaktlista"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
+msgid "Show avatars"
+msgstr "Visa profilbilder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Standardkatalog att välja en profilbild från"
+msgid "Show protocols"
+msgstr "Visa protokoll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Inaktivera popupnotifieringar under frånvaro"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Inaktivera ljud under frånvaro"
+msgid "Show Balance in contact list"
+msgstr "Visa saldo i kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Visa inkommande händelser i statusytan"
+msgid "Whether to show account balances in the contact list."
+msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
+msgid "Compact contact list"
+msgstr "Kompakt kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Stöd för ekosläckning"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publicera användarens plats"
+msgid "Hide main window"
+msgstr "Dölj huvudfönstret"
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan använda GPS:en för att gissa platsen"
+msgid "Hide the main window."
+msgstr "Dölj huvudfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
+msgid "Default directory to select an avatar image from"
+msgstr "Standardkatalog att välja en profilbild från"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan använda nätverket för att gissa platsen"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Den senaste katalogen som en profilbild valdes från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Standardhämtningsmapp för Empathy"
+msgid "Open new chats in separate windows"
+msgstr "Öppna nya chattar i separata fönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
+msgid "Always open a separate chat window for new chats."
+msgstr "Öppna alltid ett separat fönster för nya chattar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy ska ansluta automatiskt vid uppstart"
+msgid "Display incoming events in the status area"
+msgstr "Visa inkommande händelser i statusytan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy bör minska precisionen för platsen"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
+msgid "The position for the chat window side pane"
+msgstr "Positionen för chattfönstrets sidopanel"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Aktivera utvecklingsverktyg för WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Aktivera popupnotifieringar för nya meddelanden"
+msgid "Show contact groups"
+msgstr "Visa kontaktgrupper"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Aktivera stavningskontroll"
+msgid "Whether to show groups in the contact list."
+msgstr "Huruvida grupper ska visas i kontaktlistan."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Dölj huvudfönstret"
+msgid "Contact list sort criterion"
+msgstr "Sorteringskriteria för kontaktlista"
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Dölj huvudfönstret."
+#, fuzzy
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Senast kontot valt i GÃ¥ in i rum-dialogen"
+msgid "Use notification sounds"
+msgstr "Använd notifieringsljud"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Tecken för smeknamnskomplettering"
+msgid "Whether to play a sound to notify of events."
+msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Öppna nya chattar i separata fönster"
+msgid "Disable sounds when away"
+msgstr "Inaktivera ljud under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Sökväg för Adium-temat att använda"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "Spela upp ljud för inkommande meddelanden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Spela upp ett ljud för nya samtal"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Spela upp ljud för utgående meddelanden"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Spela upp ljud när en kontakt loggar in"
+msgid "Play a sound for new conversations"
+msgstr "Spela upp ett ljud för nya samtal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Spela upp ett ljud när en kontakt loggar ut"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Spela upp ljud när vi loggar in"
+msgid "Play a sound when a contact logs in"
+msgstr "Spela upp ljud när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Spela upp ljud när vi loggar ut"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
+msgid "Play a sound when a contact logs out"
+msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Visa popupnotifieringar när en kontakt loggar in"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Visa popupnotifieringar när en kontakt loggar ut"
+msgid "Play a sound when we log in"
+msgstr "Spela upp ljud när vi loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Positionera kameravisningen som den ska vara under ett samtal."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Visa saldo i kontaktlista"
+msgid "Play a sound when we log out"
+msgstr "Spela upp ljud när vi loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Visa profilbilder"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Visa kontaktlista i rum"
+msgid "Enable popup notifications for new messages"
+msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Visa tips om att stänga huvudfönstret"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Visa frånkopplade kontakter"
+msgid "Disable popup notifications when away"
+msgstr "Inaktivera popupnotifieringar under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Visa protokoll"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Rättstavningsspråk"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Standardmappen att spara filöverföringar i."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Den senaste katalogen som en profilbild valdes från."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Visa popupnotifieringar när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Positionen för chattfönstrets sidopanel"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Visa popupnotifieringar när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Det tema som används för att visa samtal i chattfönster."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Den temavariant som används för att visa samtalet i chattfönster."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "Använd grafiska smilisar"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Använd notifieringsljud"
+msgid "Show contact list in rooms"
+msgstr "Visa kontaktlista i rum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Använd tema för chattrum"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Huruvida kontaktlistan ska visas i chattrum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
+msgid "Chat window theme"
+msgstr "Chattfönstertema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Det tema som används för att visa samtal i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
+msgid "Chat window theme variant"
+msgstr "Temavariant för chattfönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Den temavariant som används för att visa samtalet i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
+msgid "Path of the Adium theme to use"
+msgstr "Sökväg för Adium-temat att använda"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
+msgid "Enable WebKit Developer Tools"
+msgstr "Aktivera utvecklingsverktyg för WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr ""
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
+msgid "Use theme for chat rooms"
+msgstr "Använd tema för chattrum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Huruvida temat för chattrum ska användas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
+msgid "Spell checking languages"
+msgstr "Rättstavningsspråk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
+msgid "Enable spell checker"
+msgstr "Aktivera stavningskontroll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
+msgid "Nick completed character"
+msgstr "Tecken för smeknamnskomplettering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
+msgid "Last account selected in Join Room dialog"
+msgstr "Senast kontot valt i GÃ¥ in i rum-dialogen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
+msgid "Camera device"
+msgstr "Kameraenhet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
+msgid "Camera position"
+msgstr "Kameraposition"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
+msgid "Position the camera preview should be during a call."
+msgstr "Positionera kameravisningen som den ska vara under ett samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
+msgid "Echo cancellation support"
+msgstr "Stöd för ekosläckning"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
+msgid "Show hint about closing the main window"
+msgstr "Visa tips om att stänga huvudfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy kan publicera användarens plats"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Huruvida kontaktlistan ska visas i chattrum."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy kan använda nätverket för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Huruvida temat för chattrum ska användas."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hantera konton för meddelanden och VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy kan använda GPS:en för att gissa platsen"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Meddelande och VoIP-konton"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy bör minska precisionen för platsen"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -475,7 +492,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Den andra deltagaren kunde inte överföra filen"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -512,212 +529,216 @@ msgstr "Ringde %s"
 msgid "Call from %s"
 msgstr "Samtal från %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frånkopplad"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Okänt"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgängligt"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Anslutningen vägrades"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Anslutningen kunde inte etableras"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Anslutningen förlorades"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Denna resurs är redan ansluten till servern"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Detta konto är redan anslutet till servern"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Din programvara är för gammal"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internt fel"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chatt"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund sedan"
 msgstr[1] "%d sekunder sedan"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut sedan"
 msgstr[1] "%d minuter sedan"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timme sedan"
 msgstr[1] "%d timmar sedan"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sedan"
 msgstr[1] "%d dagar sedan"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d vecka sedan"
 msgstr[1] "%d veckor sedan"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d månad sedan"
 msgstr[1] "%d månader sedan"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i framtiden"
 
@@ -726,7 +747,7 @@ msgid "All accounts"
 msgstr "Alla konton"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
@@ -744,30 +765,30 @@ msgstr "Server"
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "V_erkställ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogga in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Detta konto finns redan på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Skapa ett nytt konto på servern"
 
@@ -776,137 +797,137 @@ msgstr "Skapa ett nytt konto på servern"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nytt konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exempel:</b> MittSkärmnamn"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "L_ösenord:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avancerat"
+msgid "Screen _Name:"
+msgstr "Skärm_namn:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exempel:</b> MittSkärmnamn"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "L_ösenord:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Kom ihåg lösenordet"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Kom ihåg lösenordet"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Skärm_namn:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Vad är ditt AIM-lösenord?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Vad är ditt AIM-skärmnamn?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Vad är ditt AIM-lösenord?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exempel:</b> användarnamn"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Inloggningsi_d:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exempel:</b> användarnamn"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Vad är ditt användar-id för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Vad är ditt lösenord för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exempel:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Te_ckenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Vad är ditt ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Vad är ditt ICQ-lösenord?"
 
@@ -943,21 +964,25 @@ msgstr "Options"
 msgid "None"
 msgstr "Ingen"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Nätverk"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Teckenuppsättning:"
+msgid "Network:"
+msgstr "Nätverk:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
+msgid "Character set:"
+msgstr "Teckenuppsättning:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Nätverk"
+msgid "Servers"
+msgstr "Servrar"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Nätverk:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -975,48 +1000,20 @@ msgstr "Avslutningsmeddelande:"
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servrar"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Vad är ditt IRC-smeknamn?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Vilket IRC-nätverk?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exempel:</b> användare@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Exempel:</b> användare@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Kr_yptering krävs (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorera SSL-certifikatfel"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Åsidosätt serverinställningar"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Vad är ditt IRC-smeknamn?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Vad är ditt användarnamn för Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1026,179 +1023,203 @@ msgstr ""
 "Om du har facebook.com/<b>hamster</b> så ange <b>hamster</b>.\n"
 "Använd <a href=\"http://www.facebook.com/username/\">denna sida</a> för att välja ett Facebook-användarnamn om du inte redan har ett."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Använd gammal SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Vad är ditt Facebook-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Vad är ditt användarnamn för Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Vad är ditt Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Exempel:</b> användare@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Vad är ditt Google-lösenord?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exempel:</b> användare@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorera SSL-certifikatfel"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Kr_yptering krävs (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Använd gammal SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Åsidosätt serverinställningar"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Vad är ditt Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Vad är ditt Jabber-lösenord?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Vilket Jabber ID vill du använda?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Vad är ditt Jabber-lösenord?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Vilket lösenord vill du använda för Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exempel:</b> användare@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Vad är ditt id för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Vad är ditt lösenord för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_postadress:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "S_meknamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Efternamn:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Förnamn:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publikt namn:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-id:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Efternamn:"
+msgid "E-_mail address:"
+msgstr "E-_postadress:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publikt namn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "A_nvändarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exempel:</b> användare@min.sipserver"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Användarnamn för autentisering:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Upptäck bindning"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Upptäck STUN-servern automatiskt"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorera TLS-fel"
+msgid "NAT Traversal Options"
+msgstr "Flaggor för NAT-traversering"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervall (sekunder)"
+msgid "Proxy Options"
+msgstr "Proxyalternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive-flaggor"
+msgid "Miscellaneous Options"
+msgstr "Diverse alternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routing"
+msgid "STUN Server:"
+msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Upptäck STUN-servern automatiskt"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Diverse alternativ"
+msgid "Discover Binding"
+msgstr "Upptäck bindning"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Flaggor för NAT-traversering"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive-flaggor"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mekanism:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekunder)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Användarnamn för autentisering:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-server:"
+msgid "Loose Routing"
+msgstr "Loose Routing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorera TLS-fel"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Vad är lösenordet för ditt SIP-konto?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Vad är ditt inloggnings-id för SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "A_nvändarnamn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Vad är lösenordet för ditt SIP-konto?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorera inbjudningar till konferenser och chattrum"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lokalanpassning för _rumslista:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Vad är ditt Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Vad är ditt Yahoo!-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lokalanpassning för _rumslista:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1261,188 +1282,194 @@ msgstr "Nödsamtal stöds inte med detta protokollet"
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Misslyckades med att öppna privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Ämne stöds inte för detta samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du tillåts inte att ändra ämnet"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" är inte ett giltigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<chattrummets ID>] [<anledning>]: lämna chattrummet, det aktuella som standard"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: visa information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Användning: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Okänt kommando; se /help för tillgängliga kommandon"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sändning av meddelande: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, fuzzy, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "inte kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "Ã¥tkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Ämnet angivet av %s till: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Inga förslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lägg till \"%s\" till ordbok"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lägg till \"%s\" till %s-ordboken"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Misslyckades med att hämta senaste loggar"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har kopplat från"
@@ -1450,12 +1477,12 @@ msgstr "%s har kopplat från"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s sparkades ut av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s sparkades ut"
@@ -1463,17 +1490,17 @@ msgstr "%s sparkades ut"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
@@ -1483,17 +1510,17 @@ msgstr "%s har lämnat rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
@@ -1501,58 +1528,58 @@ msgstr "%s är nu känd som %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
 #: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595
+#: ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Vill du lagra detta lösenord?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Kom ihåg"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Inte nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Försök igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Felaktigt lösenord. Försök igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Detta rum är skyddat med ett lösenord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "GÃ¥ in"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
+#: ../libempathy-gtk/empathy-chat.c:4070
 #: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtal"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1584,10 +1611,10 @@ msgstr "Redigera blockerade kontakter"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1597,7 +1624,7 @@ msgstr "Blockerade kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ta bort"
@@ -1620,33 +1647,29 @@ msgstr "_Öppna länk"
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Personlig information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blockera %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Är du säker på att du vill blockera \"%s\" från att kontakta dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blockera"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1654,17 +1677,17 @@ msgstr[0] "_Rapportera denna kontakt som stötande"
 msgstr[1] "_Rapportera dessa kontakter som stötande"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Bestäm _senare"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blockera användare"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Bestäm _senare"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1819,7 +1842,7 @@ msgstr "Höjd:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Plats"
 
@@ -1845,6 +1868,16 @@ msgstr "Spara profilbild"
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara profilbild"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personliga detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktuppgifter"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullständigt namn"
@@ -1911,49 +1944,44 @@ msgstr "postadress"
 msgid "parcel"
 msgstr "leveransadress"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Plats</b> den (datum)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifierare:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientinformation"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Plats</b> den (datum)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuppgifter"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information begärd..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Identifierare:"
+msgid "Client Information"
+msgstr "Klientinformation"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Information begärd..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Version:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
@@ -1972,7 +2000,7 @@ msgid "Select"
 msgstr "Välj"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1919
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupp"
 
@@ -1992,161 +2020,145 @@ msgstr[1] "Följande identiteter kan inte blockeras:"
 msgid "Edit Contact Information"
 msgstr "Redigera kontaktinformation"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Länkade kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Välj kontakter att länka"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Förhandsvisa ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Välj konto att använda för att ringa samtalet"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HEM"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blockera kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Chatt"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Ljudsamtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Ti_digare samtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Dela ut mitt skrivbord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts är inte installerat"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edigera"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Länka kontakter..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Bjuder in dig till detta rum"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Bjud in till chattrum"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Lägg till kontakt..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Ta bort och _blockera"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
@@ -2161,7 +2173,7 @@ msgstr[1] "Länkade kontakter innehåller %u kontakter"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Plats</b> den (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Ansluten från en telefon eller mobil enhet"
 
@@ -2190,44 +2202,6 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Länka kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "A_vlänka..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Länka"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Avlänka länkade kontakter \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer helt att dela upp de länkade kontakterna till separata kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "Av_länka"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
@@ -2329,7 +2303,7 @@ msgid "Text chats"
 msgstr "Textchattar"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Samtal"
 
@@ -2362,43 +2336,43 @@ msgid "Delete from:"
 msgstr "Ta bort från:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Läser in...</span>"
+msgid "_File"
+msgstr "_Arkiv"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chatta"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "R_edigera"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Ta bort all historik..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chatta"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_edigera"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "sida 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Läser in...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Kontakten är frånkopplad"
@@ -2530,20 +2504,20 @@ msgid "Find:"
 msgstr "Sök:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_cha skiftläge"
+msgid "_Previous"
+msgstr "_Föregående"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frasen hittades inte"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Nästa"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_cha skiftläge"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Föregående"
+msgid "Phrase not found"
+msgstr "Frasen hittades inte"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2589,12 +2563,12 @@ msgstr "Röstsamtal avslutat"
 msgid "Edit Custom Messages"
 msgstr "Redigera anpassade meddelanden"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Meddelandet redigerat %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2670,18 +2644,22 @@ msgstr "Certifikatets värdnamn: %s"
 
 # Hm?
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsätt"
+msgid "C_ontinue"
+msgstr "F_ortsätt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Opålitlig anslutning"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denna anslutning är inte pålitlig. Vill du fortsätta ändå?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Kom ihåg detta val för framtida anslutningar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatinformation"
 
@@ -2936,203 +2914,73 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det inträffade ett fel när konton importerades."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det inträffade ett fel när kontot skapades."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det inträffade ett fel."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Felmeddelandet var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Vilken typ av chattkonto har du?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Ange dina kontouppgifter"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Vilken typ av chattkonto vill du skapa?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Vill du skapa andra chattkonton?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Ange uppgifterna för det nya kontot"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du ett konto som du har använt med andra chattprogram?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Ja, importera mina kontouppgifter från "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jag vill ange mina kontouppgifter nu"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Nej, jag vill ha ett nytt konto"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Välj de konton som du vill importera:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Nej, det är allt för stunden"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Redigera->Konton"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Jag vill _inte aktivera denna funktion just nu"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut är inte installerat"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Guide för meddelanden och VoIP-konton"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Välkommen till Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importera dina befintliga konton"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Ange personlig information"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finns osparade ändringar för ditt %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Ditt nya konto har inte sparats än."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Ansluter..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Frånkopplad — Ingen nätverksanslutning"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Frånkopplad — Kontot är inaktiverat"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Redigera anslutningsdetaljer"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Misslyckades med att hämta din personliga information från servern."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Anslut dig för att redigera din personliga information."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "_Redigera anslutningsdetaljer..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vill du ta bort %s från din dator?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Detta kommer inte att ta bort ditt konto på servern."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3141,15 +2989,23 @@ msgstr ""
 "förkasta dina ändringar. Är du säker att du vill fortsätta?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Inaktivera"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Hoppa över"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "An_slut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3161,25 +3017,21 @@ msgstr ""
 msgid "Add…"
 msgstr "Lägg till…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Läser in kontoinformation"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Inga protokoll installerade"
+msgid "_Import…"
+msgstr "_Importera…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Läser in kontoinformation"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "För att lägga till ett nytt konto måste du först installera en bakände för varje protokoll som du vill använda."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importera…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Inga protokollbakänder installerade"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3189,17 +3041,13 @@ msgstr "- Autentiseringsklienten Empathy"
 msgid "Empathy authentication client"
 msgstr "Autentiseringsklienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i närheten"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Ljud/Videoklienten Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Ljud/Videoklienten Empathy"
 
@@ -3242,33 +3090,33 @@ msgstr "Detaljer"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses av datorn"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses av en server på Internet"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen för klienten som den ses av andra sidan"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen för en reläserver"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen för multicast-gruppen"
 
@@ -3287,312 +3135,345 @@ msgid "Connected — %d:%02dm"
 msgstr "Ansluten — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniska detaljer"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Det inträffade ett fel på nätverket"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Det uppstod ett fel i samtalsmotorn"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Slutet på strömmen nåddes"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan inte etablera ljudström"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan inte etablera videoström"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Ljud"
+msgid "_Call"
+msgstr "_Ring"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Avkodande kodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Inaktivera kamera"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Visa knappsatsen"
+msgid "_Settings"
+msgstr "_Inställningar"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodande kodek:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Visa"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Lägg på"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Hjälp"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Avsluta aktuellt samtal"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "I_nnehåll"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokal kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Felsökning"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximera mig"
+msgid "Swap camera"
+msgstr "Växla kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimera mig"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fjärrkandidat:"
+msgid "Maximise me"
+msgstr "Maximera mig"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Skicka ljud"
+msgid "Disable camera"
+msgstr "Inaktivera kamera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Skicka video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Lägg på"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Visa knappsats"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Avsluta aktuellt samtal"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videosamtal"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Starta ett videosamtal"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Starta ett röstsamtal"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Växla kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Växla ljudöverföring"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Växla videoöverföring"
+msgid "Show dialpad"
+msgstr "Visa knappsats"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Okänt"
+msgid "Display the dialpad"
+msgstr "Visa knappsatsen"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Skicka video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videosamtal"
+msgid "Toggle video transmission"
+msgstr "Växla videoöverföring"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Ring"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Skicka ljud"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "I_nnehåll"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Växla ljudöverföring"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Felsökning"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodande kodek:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589
+#: ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Okänt"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Avkodande kodek:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Fjärrkandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Inställningar"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokal kandidat:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Visa"
+msgid "Audio"
+msgstr "Ljud"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Stäng detta fönster?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Lämna %s?"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Stäng fönstret"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Lämna rummet"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d oläst)"
 msgstr[1] "%s (%d olästa)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (och %u annat)"
 msgstr[1] "%s (och %u andra)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d oläst från andra)"
 msgstr[1] "%s (%d olästa från andra)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d oläst från alla)"
 msgstr[1] "%s (%d olästa från alla)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Skickar %d meddelande"
 msgstr[1] "Skickar %d meddelanden"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "T_öm"
+msgid "_Conversation"
+msgstr "_Samtal"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "T_öm"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Infoga _smilis"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favoritchattrum"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Bjud in _deltagare…"
+msgid "Notify for All Messages"
+msgstr "Notifiera för alla meddelanden"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Flytta flik till _vänster"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Visa kontaktlista"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Flytta flik till _höger"
+msgid "Invite _Participant…"
+msgstr "Bjud in _deltagare…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notifiera för alla meddelanden"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Samtal"
+msgid "_Tabs"
+msgstr "_Flikar"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Koppla loss flik"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favoritchattrum"
+msgid "_Previous Tab"
+msgstr "_Föregående flik"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Nästa flik"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Föregående flik"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Ån_gra flikstängning"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Visa kontaktlista"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Flytta flik till _vänster"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Flikar"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Flytta flik till _höger"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Ån_gra flikstängning"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Koppla loss flik"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3606,7 +3487,7 @@ msgstr "Rum"
 msgid "Auto-Connect"
 msgstr "Anslut automatiskt"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hantera favoritrum"
 
@@ -3615,7 +3496,7 @@ msgid "Incoming video call"
 msgstr "Inkommande videosamtal"
 
 #: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
@@ -3632,7 +3513,7 @@ msgstr "%s ringer dig. Vill du svara?"
 #: ../src/empathy-event-manager.c:531
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
@@ -3652,7 +3533,7 @@ msgstr "S_vara med video"
 
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Inkommande videosamtal från %s"
@@ -3676,7 +3557,7 @@ msgid "_Decline"
 msgstr "_Neka"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_GÃ¥ in"
 
@@ -3696,7 +3577,7 @@ msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
 #: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-roster-window.c:371
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Lösenord krävs"
 
@@ -3828,176 +3709,194 @@ msgstr "Filöverföringar"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importera"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton från Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importera konton"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Ange lösenord"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koppla ifrån"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du måste konfigurera ett konto för att se kontakter här."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen träff hittades"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Uppdatera programvara..."
 
-#: ../src/empathy-roster-window.c:805
-#: ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Anslut igen"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigera konto"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll på %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll på kontot"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll på..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakter på en ka_rta"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoinställningar"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Saldo"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nytt samtal..."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Sök i kontakt_lista"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "GÃ¥ in i _favoriter"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hantera favoriter"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nytt sa_mtal…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal storlek"
+msgid "_Search for Contacts…"
+msgstr "_Sök efter kontakter..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nytt sa_mtal…"
+msgid "_File Transfers"
+msgstr "Fi_löverföringar"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal storlek med _profilbilder"
+msgid "_Offline Contacts"
+msgstr "_Frånkopplade kontakter"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "I_nställningar"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Visa protoko_ll"
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Sortera efter _namn"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Sortera efter _status"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakter på en ka_rta"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konton"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Blockerade kontakter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Kompakt storlek"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "I_nställningar"
+
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Sök i kontakt_lista"
+
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Sortera efter _namn"
+
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Sortera efter _status"
+
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal storlek med _profilbilder"
 
 #: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Fi_löverföringar"
+msgid "N_ormal Size"
+msgstr "N_ormal storlek"
+
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Kompakt storlek"
 
 #: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_GÃ¥ in..."
+msgid "_Room"
+msgstr "_Rum"
 
 #: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nytt samtal..."
+msgid "_Join…"
+msgstr "_GÃ¥ in..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Frånkopplade kontakter"
+msgid "Join _Favorites"
+msgstr "GÃ¥ in i _favoriter"
 
 #: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlig information"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Rum"
-
-#: ../src/empathy-roster-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Sök efter kontakter..."
+msgid "Manage Favorites"
+msgstr "Hantera favoriter"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4024,6 +3923,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
@@ -4035,30 +3939,30 @@ msgstr "Kunde inte starta rumslistningen"
 msgid "Could not stop room listing"
 msgstr "Kunde inte stoppa rumslistningen"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Kunde inte läsa in rumslistan"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "GÃ¥ in i rum"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Rum:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns på servern för det aktuella kontot"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "GÃ¥ in i rum"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Kunde inte läsa in rumslistan"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Rumslista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Rum:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Meddelande togs emot"
@@ -4072,7 +3976,7 @@ msgid "New conversation"
 msgstr "Nytt samtal"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakt ansluter"
 
 #: ../src/empathy-preferences.c:170
@@ -4092,308 +3996,316 @@ msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo, min Romeo, var är du Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Förneka din fader och vägra ditt namn;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Eller om du icke, men var svurit min kärlek"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Och jag kommer inte längre att vara en Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skall jag höra mer, eller ska jag tala?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julia har kopplat från"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Inställningar"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Visa _smilisar som bilder"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Visa kontakt_lista i rum"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Utseende"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Beteende"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Starta chattar i:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chatt_ema:"
+msgid "new ta_bs"
+msgstr "nya fl_ikar"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Inaktivera notifieringar under fr_Ã¥nvaro eller upptagen"
+msgid "new _windows"
+msgstr "nya _fönster"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Inaktivera ljud under fr_Ã¥nvaro eller upptagen"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Visa inkommande händelser i notifieringsytan"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Anslut _automatiskt vid uppstart"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
+msgid "Log conversations"
+msgstr "Logga samtal"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Aktivera notifieringar när en kontakt ansluter"
+msgid "Behavior"
+msgstr "Beteende"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Aktivera notifieringar när en kontakt kopplar från"
+msgid "General"
+msgstr "Allmänt"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
+msgid "_Enable bubble notifications"
+msgstr "_Aktivera bubbelnotifieringar"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Aktivera rättstavning för språk:"
+msgid "Disable notifications when _away or busy"
+msgstr "Inaktivera notifieringar under fr_Ã¥nvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Allmänt"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Aktivera notifieringar när en kontakt ansluter"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Platskällor:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Aktivera notifieringar när en kontakt kopplar från"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Logga samtal"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notifieringar"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Aktivera ljudnotifieringar"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Spela upp ljud för händelser"
+msgid "Disable sounds when _away or busy"
+msgstr "Inaktivera ljud under fr_Ã¥nvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Integritet"
+msgid "Play sound for events"
+msgstr "Spela upp ljud för händelser"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
+msgid "Sounds"
+msgstr "Ljud"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Visa _smilisar som bilder"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Använd _ekosläckning för att förbättra samtalskvaliteten"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Visa kontakt_lista i rum"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Ljud"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Stavningskontroll"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Listan visar endast språk som du har en ordlista installerad för."
+msgid "_Publish location to my contacts"
+msgstr "_Publicera platsen till mina kontakter"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Teman"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr ""
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_Reduce location accuracy"
+msgstr "_Minska precision för plats"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "Anslut _automatiskt vid uppstart"
+msgid "Privacy"
+msgstr "Integritet"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Mobiltelefon"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Aktivera bubbelnotifieringar"
+msgid "_Cellphone"
+msgstr "_Mobiltelefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Aktivera ljudnotifieringar"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nätverk (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Platskällor:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Öppna nya chattar i separata fönster"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Listan visar endast språk som du har en ordlista installerad för."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicera platsen till mina kontakter"
+msgid "Enable spell checking for languages:"
+msgstr "Aktivera rättstavning för språk:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Stavningskontroll"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Minska precision för plats"
+msgid "Chat Th_eme:"
+msgstr "Chatt_ema:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teman"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring upp kontakten igen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera av"
+msgid "Redial"
+msgstr "Ring igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera på"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video av"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Inaktivera kamera och stoppa videoöverföringen"
+msgid "Video Preview"
+msgstr "Videoförhandsvisning"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Aktivera kamera och överför video"
+msgid "Video On"
+msgstr "Video på"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Aktivera kameran med överför ingen video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Ring upp kontakten igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Förhandsvisning"
+msgid "Camera Off"
+msgstr "Kamera av"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring igen"
+msgid "Disable camera and stop sending video"
+msgstr "Inaktivera kamera och stoppa videoöverföringen"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Förhandsvisning"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video av"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Aktivera kameran med överför ingen video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video på"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera på"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoförhandsvisning"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Aktivera kamera och överför video"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kartvy för kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Spara"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Gör paus"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Felsökning"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889
+#: ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Varning"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritiskt"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domän"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
 
@@ -4410,31 +4322,27 @@ msgstr "Välj en kontakt att bjuda in till samtalet:"
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Visa kontoguiden"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konton"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konton"
 
@@ -4450,7 +4358,7 @@ msgstr "- Empathy-felsökare"
 msgid "Empathy Debugger"
 msgstr "Empathy-felsökare"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy chattklient"
 
@@ -4459,13 +4367,13 @@ msgid "Respond"
 msgstr "Svara"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Avvisa"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Svara"
 
@@ -4497,39 +4405,39 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179
+#: ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Väntar"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Tyst"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Längd"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ditt aktuella saldo är %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Fyll på"
 
@@ -4537,10 +4445,187 @@ msgstr "Fyll på"
 msgid "_Match case"
 msgstr "_Matcha skiftläge"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Vilken typ av chattkonto har du?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Lägger till nytt konto"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i närheten"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlig information"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Länkade kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Välj kontakter att länka"
+
+#~ msgid "New contact preview"
+#~ msgstr "Förhandsvisa ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Länka kontakter..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Länka kontakter"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "A_vlänka..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
+
+#~ msgid "_Link"
+#~ msgstr "_Länka"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Avlänka länkade kontakter \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer "
+#~ "helt att dela upp de länkade kontakterna till separata kontakter."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "Av_länka"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Det inträffade ett fel när konton importerades."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Det inträffade ett fel när kontot skapades."
+
+#~ msgid "There was an error."
+#~ msgstr "Det inträffade ett fel."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Felmeddelandet var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen "
+#~ "eller avsluta denna guide och lägga till konton senare från Redigera-"
+#~ "menyn."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ett fel inträffade"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Ange dina kontouppgifter"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Vilken typ av chattkonto vill du skapa?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Vill du skapa andra chattkonton?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Ange uppgifterna för det nya kontot"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatta med anslutna personer i närheten och med vänner "
+#~ "och kollegor som använder Google Talk, AIM, Windows Live och många andra "
+#~ "chattprogram. Du kan även använda ljud- och videosamtal om du har en "
+#~ "mikrofon eller webbkamera."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du ett konto som du har använt med andra chattprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importera mina kontouppgifter från "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jag vill ange mina kontouppgifter nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jag vill ha ett nytt konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Välj de konton som du vill importera:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det är allt för stunden"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigera->Konton"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jag vill _inte aktivera denna funktion just nu"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du kommer inte att kunna chatta med personer som är anslutna till ditt "
+#~ "lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill "
+#~ "aktivera denna funktion så installera paketet telepathy-salut och skapa "
+#~ "ett Personer i närheten-konto från Konto-dialogrutan"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Guide för meddelanden och VoIP-konton"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Välkommen till Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importera dina befintliga konton"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Ange personlig information"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoll:"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlig information"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Öppna nya chattar i separata fönster"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Visa kontoguiden"
+
 #~ msgid "Call volume"
 #~ msgstr "Samtalsvolym"
 
@@ -5283,9 +5368,6 @@ msgstr "Lägger till nytt konto"
 #~ msgid "gtk-quit"
 #~ msgstr "Avsluta"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "Inställningar för ICQ-konto"
-
 #~ msgid "jabber account settings"
 #~ msgstr "inställningar för jabberkonto"
 
@@ -5368,8 +5450,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Snabbmeddelandeklient för Gnome"
 #~ msgid "-"
 #~ msgstr "-"
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personliga detaljer</b>"
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 #~ msgid "<b>Subscription</b>"
@@ -5454,8 +5534,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Använd systemets pro_xyinställningar"
 #~ msgid "_Birthday:"
 #~ msgstr "_Födelsedag:"
-#~ msgid "_Connect"
-#~ msgstr "An_slut"
 #~ msgid "_Deny"
 #~ msgstr "_Neka"
 #~ msgid "_Disconnect"
@@ -5647,8 +5725,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Ett okänt fel inträffade under filöverföringen."
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "NÃ¥gon vill skicka en fil till dig."
-#~ msgid "Retry connection"
-#~ msgstr "Ã…teranslut"
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inbjöd %s till att gå med i chattkonferens."
 #~ msgid "%s has set the topic: %s"
@@ -5965,8 +6041,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "<b>Utseende och beteende</b>"
 #~ msgid "Check spelling while I _type"
 #~ msgstr "Kontrollera stavning medan jag skriver"
-#~ msgid "Close this chat window"
-#~ msgstr "Stäng detta chattfönster"
 #~ msgid "Requested Information"
 #~ msgstr "Information efterfrågad"
 #~ msgid "Requested information."
diff --git a/po/ta.po b/po/ta.po
index e547c70d8..8bd03cd10 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -4,15 +4,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Dr.T.vasudevan <agnihot3@gmail.com>, 2009.
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2009, 2010, 2011.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2009, 2010, 2011, 2012.
 # I. Felix <ifelix@redhat.com>, 2009.
 # Dr,T,Vasudevan <agnihot3@gmail.com>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-18 13:57+0530\n"
-"PO-Revision-Date: 2011-09-18 13:59+0530\n"
+"POT-Creation-Date: 2012-02-26 12:33+0530\n"
+"PO-Revision-Date: 2012-02-26 12:36+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ta\n"
@@ -44,79 +44,85 @@ msgstr "எம�பதி இணைய செய�தியாளர� "
 msgid "IM Client"
 msgstr "� எம� சார�ந�தோன�"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள� �  மேலாளவ�ம� "
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள�"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "எப�போத�ம� ப�திய அரட�டைக�க� ப�திய சாளரம� திற"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "அழைப�ப� ஒலி அளவ�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "அழைப�ப� ஒலி அளவ�, சதவிகிதமாக."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "கேமரா சாதனம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "கேமரா நிலை"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "க�ழ� அரட�டையில� செல�லப�பெயர� கீற�றில� செல�லப�பெயர�க�க�ப�பின� சேர�க�க வேண�டிய எழ�த�த�ர�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "அரட�டை சாளர கர�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "அரட�டை சாளர மாற�ற� கர�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "சொல� திர�த�தி மொழிகளை பயன�பட�த�த காற� ப�ள�ளியால� பிரித�த பட�டியல� (எ-ட�.  \"en, fr, nl "
 "\")"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "அடக�கமான தொடர�ப� பட�டியல�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "இணைப�ப� மேலாளரை பயன�பட�த�த வேண�ட�ம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "தொடர�ப� பட�டியல� வரிசைப�பட�த�த கட�டளை விதி"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "ஒர� அறையில� சேர கடைசியாக தேர�ந�தெட�த�த கணக�கின� டி-பஸ� பொர�ள� பாதை"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "விடியோ அழைப�ப�கள�க�க� ம�ன�னிர�ப�ப� கேமரா சாதனம�. எ-கா. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "அவதாரம� படம� தேந�தெட�க�க ம�ன�னிர�ப�ப� அடைவ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "வெளியே உள�ள போத� த�ள�ள� அறிவிப�ப�களை செயல� நீக�க�க"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "வெளியே உள�ள போத� ஒலியை செயல� நீக�க�க"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "உள�வர�ம� நிகழ�ச�சிகளை நிலைப�பலக இடத�தில� காட�ட�க."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -124,70 +130,74 @@ msgstr ""
 "உள�வர�ம� நிகழ�ச�சிகளை நிலை அறிவிப�ப� இடத�தில� காட�ட�க. இல�லை என அமைந�தால� பயனர�க�க� உடனே "
 "காட�ட�க."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "எதிரொலி நீக�கி ஆதரவ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "பயனரின� இடத�தை தொடர�ப�கள�க�க� எம�பதியால� காட�ட இயல�ம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "எம�பதியால� பயனரின� இடத�தை ஊகிக�க ஜிபிஎஸ� �  பயன�பட�த�த இயல�ம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "எம�பதியால� பயனரின� இடத�தை ஊகிக�க அலைபேசி வலையை  பயன�பட�த�த இயல�ம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "எம�பதியால� பயனரின� இடத�தை ஊகிக�க  வலையை பயன�பட�த�த இயல�ம�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "எம�பதி ம�ன�னிர�ப�ப� தரவிறக�க அடைவ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "எம�பதி பட�டர�ப�ளை லாக�ஸ� இலிர�ந�த� இட மாற�றம� ஆகிவிட�டத�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "ச�ம�மா இர�க�க�ம� போத� எம�பதி தானியங�கியாக வெளியே இர�ப�பதாக வேண�ட�ம�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "த�வங�க�ம� போத� எம�பதி தானியங�கியாக இணைக�க வேண�ட�ம�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "த�வங�க�ம� போத� எம�பதி இடததின� க�றிப�பை க�றைக�க வேண�ட�ம�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "த�வங�க�ம� போத� எம�பதி அரட�டை சாரளத�தில�  சின�னமாக தொடர�பின� அவதாரத�தை காட�ட  வேண�ட�ம�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "வெப�கிட� உர�வாக�க�வோர� கர�விகளை செயல�பட�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "ப�திய செய�திகள�க�க� த�ள�ள� அறிவிப�ப�களை செயல�பட�த�த� "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "சொல� திர�த�தியை செயல�பட�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "ம�தன�மை சாளரத�தை மறை "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "ம�தன�மை சாளரத�தை மறை "
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "மற�ற பயனர�கள�க�க� அவர�கள�க�காக தட�டச�ச�ம� போத� தெரிவிக�கவ�ம�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "அறையில� சேர� உரையாடலில� கடைசியாக தேர�ந�தெட�த�த கணக�க�"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "செல�லப�பெயரை பூர�த�தி செய�ய�ம� எழ�த�த�ர�"
@@ -257,81 +267,81 @@ msgid "Show avatars"
 msgstr "அவதாரங�களை காட�ட�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "தொடர�ப� க�ழ�க�கள காட�ட� "
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "தொடர�ப� பட�டியல� � அறைகளில� காட�ட� "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "ம�தன�மை சாளரத�தை மூடிவத� க�றித�த� க�றிப�ப� காட�ட� "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr " வலை தொடர�பில�லாத தொடர�ப�களை காட�ட�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "விதிம�றைகளை காட�ட�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "எழ�த�த�ப�பிழை திர�த�த மொழி"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "இடமாற�றிய கோப�ப�களை சேமிக�க ம�ன�னிர�ப�ப� அடைவ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "அவதாரம� படம� தேர�ந�தெட�த�த கடைசி அடைவ� "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "அரட�டை சாளரத�தின� பக�கப� பலக இடம� "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "அரட�டை பக�கப� பலகத�தின� சேமித�த இடம� (பிக�ஸல�களில�)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "அரட�டை சாளரங�களில� உரையாடல�களை காட�ட பயன�பட�ம� கர�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "அரட�டை சாளரங�களில� உரையாடல�களை காட�ட பயன�பட�ம� மாற�ற� கர�த�த�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "வரைகலை சிரிப�பான�களை பயன�பட�த�த�க"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "அறிவிப�ப� ஒலிகளை பயன�பட�த�த�க"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "அரட�டை அறைகள�க�க� கர�த�த�க�களை பயன�பட�த�த�க"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "பயனரின� இடத�தை தொடர�ப�கள�க�க� எம�பதி காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "எம�பதி பயனரின� இடத�தை ஊகிக�க ஜிபிஎஸ� � பயன�பட�த�தலாமா இல�லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "எம�பதி பயனரின� இடத�தை ஊகிக�க அலைபேசி வலையை பயன�பட�த�தலாமா இல�லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "எம�பதி பயனரின� இடத�தை ஊகிக�க  வலையை பயன�பட�த�தலாமா இல�லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "எம�பதி பட�டர�ப�ளை லாக�ஸ� இலிர�ந�த� இட மாற�றம� ஆகிவிட�டதா? "
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "எம�பதி த�வங�க�ம�போத� கணக�க�களில� தானியங�கியாக உள�ந�ழைய வேண�ட�மா இல�லையா."
@@ -344,7 +354,8 @@ msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "அந�தரங�கத�தை காப�பாற�ற த�வங�க�ம� போத� எம�பதி இடத�தின� க�றிப�பை க�றைக�க வேண�ட�மா இல�லையா"
+msgstr ""
+"அந�தரங�கத�தை காப�பாற�ற த�வங�க�ம� போத� எம�பதி இடத�தின� க�றிப�பை க�றைக�க வேண�ட�மா இல�லையா"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
@@ -409,14 +420,22 @@ msgid "Whether to play sound notifications when away or busy."
 msgstr "வெளியே அல�லத� வேலையாக உள�ள போத� ஒலி அறிக�கைகளை இயக�க வேண�ட�மா இல�லையா?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"'உர�வாக�கம� ' அல�லத� 'இடைநிற�த�தம�' அரட�டை நிலைகளை அன�ப�பவா. இத� நடப�ப� 'போயாயிற�ற�' "
+"நிலையை பாதிக�காத�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "தொடர�ப� இணைப�ப� விலகி செல�கையில�  த�ள�ள� அறிக�கைகளை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "தொடர�ப� இணைப�பில� வர�கையில�  த�ள�ள� அறிக�கைகளை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -424,39 +443,43 @@ msgstr ""
 "ப�திய செய�தி ஒன�ற� வர�ம�போத� அரட�டை திறந�த� இர�ந�த� க�விப�பில� இல�லாவிட�டால�ம� த�ள�ள� "
 "அறிக�கையை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ப�திய செய�தி ஒன�ற� வர�ம�போத�  த�ள�ள� அறிக�கையை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr " தொடர�ப� பட�டியலில� கணக�க� மீதியை  காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "அரட�டை பட�டியலில�ம� தொடர�ப� பட�டியலில�ம� அவதாரங�களை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "தொடர�ப� பட�டியலில�ம� இணைப�பில� இல�லாத தொடர�ப�களை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr " தொடர�ப� பட�டியலில� க�ழ�க�களை காட�ட வேண�ட�மா இல�லையா?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "வெளியே அல�லத� வேலையாக உள�ள போத� த�ள�ள� அறிக�கைகளை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr " தொடர�ப� பட�டியலில� விதிம�றைகளை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "அரட�டை அறையில� தொடர�ப� பட�டியலை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "அடக�கப�பாங�கில� தொடர�ப� பட�டியலை காட�ட வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -464,47 +487,65 @@ msgstr ""
 "தலைப�ப� பட�டியில� x பொத�தானால� ம�தன�மை சாளரத�தை மூட�வதை க�றித�த உரையாடலை காட�ட "
 "வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "அரட�டை அறைகளில� கர�த�த�க�களை பயன�பட�த�த வேண�ட�மா இல�லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "தொடர�ப� பட�டியல� � வரிசைப�பட�த�த�ம� போத� பயன�பட�த�த நிபந�தனைகள�. ம�ன�னிர�ப�ப�   தொடர�ப� "
-"பெயர� மதிப�ப� \"பெயர�\". \"நிலை\" என�ற மதிப�ப� தொடர�பை நிலையை பொர�த�த� "
+"நிலை மதிப�ப� \"நிலை\". \"பெயர�\" என�ற மதிப�ப� தொடர�பின� பெயரை பொர�த�த� "
 "வரிசைப�பட�த�த�ம�."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள� �  மேலாளவ�ம� "
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "காரணம� க�றிப�பிடவில�லை"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள�"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "நிலையில� மாற�றம� வேண�டப�பட�டத�"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "நீங�கள� கோப�ப� பரி மாற�றத�தை ரத�த� செய�தீர�கள�"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "மற�ற பங�க�தாரர� கோப�ப� பரி மாற�றத�தை ரத�த� செய�தார�."
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "கோப�ப� பரி மாற�றத�தில�  பிழை "
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "மற�ற பங�க�தாரர� கோப�ப� பரி மாற�றத�தை செய�ய ம�டியவில�லை."
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "தெரியாத காரணம�"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "கோப�ப� பறிமாற�றம� ம�டிந�தத� ஆனால� கோப�ப� சிதைந�தத�. "
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "கோப�ப� பறிமாற�றத�த�க�க� தொலை தொலைதொடர�பில� ஆதரவில�லை"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "தேர�ந�தெட�த�த கோப�ப� வழக�கமான கோப�ப� அல�ல"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "தேர�ந�தெட�த�த கோப�ப� காலியாக உள�ளத�"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s இடமிர�ந�த� தவறிய அழைப�ப�"
@@ -520,168 +561,137 @@ msgstr "%s  அழைக�கப�பட�டார� "
 msgid "Call from %s"
 msgstr "%s இடமிர�ந�த� அழைப�ப�"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "சொர�கி வாய� வகை க�க� ஆதரவில�லை"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "காரணம� க�றிப�பிடவில�லை"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "நிலையில� மாற�றம� வேண�டப�பட�டத�"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "நீங�கள� கோப�ப� பரி மாற�றத�தை ரத�த� செய�தீர�கள�"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "மற�ற பங�க�தாரர� கோப�ப� பரி மாற�றத�தை ரத�த� செய�தார�."
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "கோப�ப� பரி மாற�றத�தில�  பிழை "
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "மற�ற பங�க�தாரர� கோப�ப� பரி மாற�றத�தை செய�ய ம�டியவில�லை."
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "தெரியாத காரணம�"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "இர�ப�பவை"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "வேலையில�"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "வெளியில�"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "மறைந�த�"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "இணைப�ப� விலகி"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "காரணம� க�றிப�பிடவில�லை"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "நிலை இப�போத� இணைப�ப� விலகி "
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "வலையமைப�ப� பிழை"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "உற�தி செய�தல� தோல�வி"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "மறையாக�க பிழை"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "பயனில� உள�ள பெயர� "
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "சான�றிதழ� தரப�படவில�லை"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "சான�றிதழில� நம�பக தன�மை இல�லை"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "சான�றிதழ� காலாவதியானத�"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "சான�றிதழ� செயல�பட�த�தப�படவில�லை"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "சான�றிதழ� ப�ரவலன� பெயர� ஒத�திசையவில�லை"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "சான�றிதழ� அடையாளம� ஒத�திசையவில�லை"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "சான�றிதழ� தானே கையெழ�த�திட�டத�"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "சான�றிதழ� பிழை"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "க�றீயீட�ட�ம�றை கிடைப�பில� இல�லை"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "சான�றிதழ� செல�ல�படியாகாத�"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "இணைப�ப� மற�க�கப�பட�டத�"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "இணைக�க ம�டியவில�லை"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "இணைப�ப� அற�ற�ப�போயிற�ற�"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "இந�த மூலம� �ற�கனவே சேவையகத�த�க�க� இணைக�கப�பட�டத�"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "இந�த கணக�க� �ற�கனவே சேவையகத�த�க�க� இணைக�கப�பட�டத�"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "இணைப�ப� அதே ம�லத�த�டன� ப�திய இணைப�பால� மாற�றப�பட�டத�."
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "இந�த கணக�க� �ற�கனவே சேவையகத�தில� உள�ளத�"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "இணைப�பை கையாள சேவையகம� இப�போத� மிகவ�ம� வேலை பள�வில� உள�ளத�."
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "சான�றிதழ� ரத�த� செய�யப�பட�டத�"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "சான�றிதழ� பாத�காப�பில�லாத சைபர� அல�கோரிதத�தை பயன�பட�த�த�கிறத�. இத� மறையாக�கத�தில� "
 "பலகீனமானத�."
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -689,165 +699,144 @@ msgstr ""
 "சேவயகத�தின� சான�றிதழின� நீளம� அல�லத� சங�கிலியின� ஆழம� மறையாக�க நூலகம� வரயற�த�த மதிப�பை "
 "தாண�டியத�."
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "உங�கள� மென�பொர�ள� மிகவ�ம� பழையத�"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "உள�ளார�ந�த பிழை"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "அர�கில� உள�ள மக�கள�"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "யாஹூ! ஜப�பான�"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "கூக�ள� டாக� "
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook அரட�டை"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d வினாடி ம�ன�"
 msgstr[1] "%d வினாடிகள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d நிமிடம� ம�ன�"
 msgstr[1] "%d நிமிடங�கள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d மணி ம�ன�"
 msgstr[1] "%d மணிகள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d நாள� ம�ன�"
 msgstr[1] "%d நாட�கள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d வாரம� ம�ன�"
 msgstr[1] "%d வாரங�கள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d மாதம� ம�ன�"
 msgstr[1] "%d மாதங�கள� ம�ன�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "எதிர�காலத�தில�"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "அனைத�த� கணக�க�கள�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "கணக�க�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "கடவ�ச�சொல�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "சேவையகம�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "த�றை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "என� வலை கணக�க�கள� "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s கணக�க� %s வழியாக திர�த�தப�பட வேண�ட�ம�."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s கணக�கை எம�பதிக�க� சேர�க�க�க இயலாத�. "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "என� வலை கணக�க�கள� � த�வக�க�க. "
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s � திர�த�த�"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr " பயனர� பெயர�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_p அமை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "(_o) உள�ந�ழை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "இந�த கணக�க� �ற�கனவே சேவையகத�தில� உள�ளத�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "சேவையகத�தில� ஒர� ப�திய கணக�கை த�வக�க�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_n ரத�த�செய�க"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s மீத�  %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s கணக�க�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "ப�திய கணக�க�"
 
@@ -895,7 +884,7 @@ msgstr "கடவà¯�சà¯�சொலà¯�லை நினைவà¯� கொளà¯�ளà
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "கடவ�ச�சொல�லை நினைவ� கொள�ளவ�ம�"
 
@@ -1220,7 +1209,7 @@ msgid "STUN Server:"
 msgstr "ஸ�டன� சேவையகம�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "சேவையகம�:"
 
@@ -1301,61 +1290,65 @@ msgstr "அனைத�த� கோப�ப�கள�"
 msgid "Click to enlarge"
 msgstr "பெரியதாக�க சொட�க�க�க"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "அழைப�பை த�வக�க�ம� போத� ஒர� பிழை."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "க�றிப�பிட�ட தொடர�ப� அழைப�ப�களை ஆதரிக�கவில�லை"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "க�றிப�பிட�ட தொடர�பாளர� இணைப�ப� விலகி உள�ளார�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "க�றிப�பிட�ட தொடர�ப� செல�ல�படி ஆகாத�."
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "இந�த நெறிம�றையில� அவசர அழைப�ப�கள�க�க� ஆதரவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "இந�த அழைப�பை செய�ய உங�கள� கணக�கில� போதிய பணம� இல�லை"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "அந�தரங�க அரட�டை திறக�க�ம� போத� தோல�வி "
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "இந�த உரையாடலில� இந�த தலைப�ப�க�க� ஆதரவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "தலைப�பை மாற�ற அன�மதி உங�கள�க�கில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s�  செல�ல�படியாகாத தொடர�ப� �டி"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: நடப�ப� உரையாடலில� இர�ந�த� எல�லா செய�திகளைய�ம� த�டைக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: நடப�ப� உரையாடல�க�க� தலைப�பை அமைக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ப�திய அரட�டை அறைக�க� சேரவ�ம�."
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ப�திய அரட�டை அறைக�க� சேரவ�ம�."
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1363,23 +1356,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: அரட�டை அறையில� இர�ந�த� வெளியேற�க, "
 "ம�ன�னிர�ப�பாகநடப�ப� அறை"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: அந�தரங�க அரட�டையை த�வக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: அந�தரங�க அரட�டையை த�வக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: தற�போதைய சேவயகத�தில� உங�கள� செல�லபெயரை மாற�றவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: நடப�ப� உரையாடலில� ஆக�ஷன� செய�தி ஒன�ற� அன�ப�ப�க"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1388,11 +1381,11 @@ msgstr ""
 "/say <message>: send <message> நடப�ப� உரையாடல�க�க�. இத� '/' உடன� த�வங�க�ம� "
 "செய�தியை அன�ப�பப�பயன�பட�ம�.உதாரணமாக: \"/say /join ப�திய அரட�டை அறையில� சேர உதவ�ம�.\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>:  ஒர� தொடர�ப� க�றித�த தகவலை காட�ட�க"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1400,113 +1393,126 @@ msgstr ""
 "/help [<command>]: அனைத�த� ஆதரவ�ள�ள கட�டளைகளைய�ம� காட�ட�க. <command> � அற�தி இட�ட� "
 "இர�ப�பின� பயனை காட�ட�க."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "பயன�பாட�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "தெரியாத கட�டளை"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "தெரியாத கட�டளை. ஆதரவ�ள�ள கட�டளைகள�க�க� /help � பார�க�கவ�ம�"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "செய�தி அன�ப�ப போத�மான கட�டண மீதம�  இல�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "செய�தி '%s' அன�ப�ப�வதில� பிழை: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "செய�தி  அன�ப�ப�வதில� பிழை: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "செய�தி அன�ப�ப போத�மான கட�டண மீதம�  இல�லை. <a href='%s'>கட�டணமளி</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "இயலாத� "
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "இணைப�ப� விலகி "
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "செல�ல�படியாகாத தொடர�ப�"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "அன�மதி மற�க�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "மிக நீள செய�தி"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "அம�லாக�கவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "தெரியாத"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "செய�தி '%s' அன�ப�ப�வதில� பிழை: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "செய�தி  அன�ப�ப�வதில� பிழை: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "தலைப�ப�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "தலைப�ப� இதற�க� அமை: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "தலைப�ப�  %s ஆல� இதற�க� அமைக�கப�பட�டத�: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "தலைப�ப� �த�ம� வரையற�க�கப�படவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(பரிந�த�ரைகள� இல�லை )"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr " '%s' �  அகராதிக�க� சேர�"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr " '%s' � %s அகராதிக�க� சேர�"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "சிரிப�பானை சொர�க�"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "அன�ப�ப� (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_S எழ�த�தாக�க பரிந�த�ரைகள� "
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "சமீபத�திய பதிவேட�ட� உள�ளீட�களை  மீட�க�ம� போத� தோல�வி "
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s தொடர�பை த�ண�டித�தார�"
@@ -1514,12 +1520,12 @@ msgstr "%s தொடர�பை த�ண�டித�தார�"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s %2$sஆல� உதைக�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s உதைத�த� வெளியேற�றப�பட�டார�"
@@ -1527,17 +1533,17 @@ msgstr "%s உதைதà¯�தà¯� வெளியேறà¯�றபà¯�படà¯�டà®
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s %2$sஆல� தடை செய�யப�பட�டார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s தடை செய�யப�பட�டார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s அறையில� இர�ந�த� வெளியேறினார�"
@@ -1547,17 +1553,17 @@ msgstr "%s அறையிலà¯� இரà¯�நà¯�தà¯� வெளியேறிà
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s அறையில� சேர�ந�தார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s இப�போத� %s ஆனார�"
@@ -1565,88 +1571,87 @@ msgstr "%s இப�போத� %s ஆனார�"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "த�ண�டிக�கபட�டத�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "இந�த கடவ�ச�சொல�லை நினைவ� கொள�ள வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "நினைவ� கொள�ளவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "இப�போத� இல�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "மற� ம�யற�சி"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "தவறான கடவ�ச�சொல�. தயை செய�த� மீண�ட�ம� ம�யற�சிக�கவ�ம�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "இந�த அறை ஒர� கடவ�ச�சொல�லால� பாத�காக�கப�பட�ட�ள�ளத�."
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "இணை"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "இணைக�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "உரையாடல�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "தெரியாத அல�லத� செல�ல�படியாகாத அடையாளம� காணி"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "தற�காலிகமாக தொடர�ப� தட�ப�பி கிடைப�பில� இல�லை."
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "தொடர�ப� தட�ப�பி கிடைப�பில� இல�லை"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "அன�மதி மற�க�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "தொடர�பை தட�க�க ம�டியவில�லை"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "தட�க�கப�பட�ட தொடர�ப�களை திர�த�த�"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1658,62 +1663,53 @@ msgstr "தட�க�கப�பட�ட தொடர�ப�கள�"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "நீக�கவ�ம� "
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "இணைப�ப� ம�கவரியை நகலெட� (_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "இணைப�பினை திற (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "தொடர�பின�  தகவல� � திர�த�த�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "தனிப�பட�ட தகவல�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "ப�திய தொடர�ப�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s � தட�க�கவா?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "%s � உங�களை தொடர�ப� கொள�வதில� இர�ந�த� நிச�சயம� தட�க�க வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_B தட�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_R இந�த தொடர�பை வசைமொழியாளர� என அறிவிக�கவ�ம�"
@@ -1731,349 +1727,268 @@ msgstr "சந�தா வேண�ட�தல�"
 msgid "_Block User"
 msgstr "_B பயனரை தட�க�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "க�ழ�வில� சேர�க�காத "
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "பிடித�தமான நபர�கள� "
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "நீங�கள� நிச�சயம� க�ழ� '%s' � நீக�க விர�ம�ப�கிறீர�களா?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "க�ழ�வை நீக�க�தல�"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "நீக�கவ�ம� (_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "நீங�கள� நிச�சயம� தொடர�ப� '%s' � நீக�க விர�ம�ப�கிறீர�களா?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "தொடர�ப� � நீக�க�தல�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "(_A) தொடர�பை  சேர�."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "தொடர�பை தட�க�கவ�ம� (_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_C அரட�டை"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "(_A) ஒலி அழைப�ப�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "(_V) விடியோ அழைப�ப�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "(_P) ம�ந�தைய உரையாடல�கள�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "கோப�ப� � அன�ப�ப�க"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "என� மேல�மேசையை பகிர�ந�த� கொள�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "பிடித�தமான"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "(_m) தகவல�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "திர�த�த� (_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "இந�த அறைக�க� அழைப�ப�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_I அரட�டை அறைக�க� அழைப�ப�"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "தொடர�ப�aகளை தேட�க"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "தேட�:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "(_A) தொடர�பை  சேர�."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "பொர�த�தம�  �த�ம� காணப�படவில�லை"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "உங�களை அறிம�கப�பட�த�த�ம� செய�தி:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "நீங�கள� இணைப�பில� வர�ம� போத� என�னை பார�ங�கள�, நன�றி!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ஒர� தொடர�ப� � தேர�வ� செய�க"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ம�ழ�ப�பெயர�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "தொலைபேசி எண�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "மின�னஞ�சல� ம�கவரி:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "வலைத�தளம�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "பிறந�தநாள�:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "கடைசியாக கண�டத�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "இங�கிர�ந�த� இணைக�கப�பட�டத�:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "வெளிச�செல� செய�தி:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ஓடைகள�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "நாட�டின� �எஸ�ஓ க�றி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "நாட�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "மாநிலம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "மாநகரம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "வட�டாரம�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "அஞ�சல� க�றி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "தெர�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "கட�டிடம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "தளம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "அறை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "உரை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "விவரணம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "யூஆர��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "பிழையின�மை மட�டம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr " பிழை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "செங�க�த�த� பிழை (மீட�டர�கள�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "கிடைமட�ட பிழை (மீட�டர�கள�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "வேகம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "திசை கோணம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "�ற�ம� வேகம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "கடைசியாக இற�றைப�பட�த�தியத�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "தீர�கரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "அட�சரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "க�த�த�யரம�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "இடம�"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y  %R யூட�சி (UTC) இல�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "அவதாரத�தை சேமி"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "அவதாரத�தை சேமிக�க ம�டியவில�லை"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "தனிப�பட�ட விவரங�கள�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "தொடர�ப� விவரங�கள�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "ம�ழ�ப�பெயர�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "தொலைபேசி எண�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "மின�னஞ�சல� ம�கவரி"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "வலைத�தளம�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "பிறந�தநாள�"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "கடைசியாக கண�டத�:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "இங�கிர�ந�த� இணைக�கப�பட�டத�:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "வெளிச�செல� செய�தி:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "வேலை"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "இல�லம�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "அலைபேசி "
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "க�ரல�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "விர�ப�பங�கள�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "அஞ�சல�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "பார�சல�"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>இடம�</b> (date) போத�\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "ப�னைப�பெயர�:"
 
@@ -2085,15 +2000,10 @@ msgstr "சார�ந�தோன� தகவல�"
 msgid "Client:"
 msgstr "சார�ந�தோன�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "தொடர�ப� விவரங�கள�"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "இனங�காட�டி:"
 
@@ -2110,11 +2020,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "பதிப�ப�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "க�ழ�க�கள�"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2122,105 +2032,167 @@ msgstr ""
 "இந�த தொடர�ப� வர வேன�டிய க�ழ�வை தேர�வ� செய�க. நீங�கள� ஒன�ற�க�க� மேற�பட�ட க�ழ�க�களை தேர�வ� "
 "செய�யலாம� அல�லத� ஒன�றைய�ம� தேர�வ� செய�யாதிர�க�கலாம�."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "க�ழ�வை சேர� (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "தேர�வ� செய�க "
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "க�ழ�"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "கீழ� கண�ட அடையாளம� தட�க�கப�பட�ம�:"
 msgstr[1] "கீழ� கண�ட அடையாளங�கள� தட�க�கப�பட�ம�:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "கீழ� கண�ட அடையாளம� தட�க�கப�பட ம�டியவில�லை"
 msgstr[1] "கீழ� கண�ட அடையாளங�கள� தட�க�கப�பட ம�டியவில�லை"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "தொட�ப�பில� உள�ள தொடர�ப�கள�"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "தொட�ப�ப�க�க� தொடர�ப�களை  � தேர�வ� செய�க"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "ப�திய தொடர�ப� ம�ன� பார�வை"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "இடத� பக�கம� உள�ள பட�டியலில� தெர�ந�தெட�த�த தொடர�ப�கள� ஒண�றாக இணைக�கப�பட�ம�."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "தொடர�பின�  தகவல� � திர�த�த�"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "அழைப�பை அமைக�க கணக�கை தேர�ந�தெட�"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "அழை"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "அலைபேசி "
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "வேலை"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "இல�லம�"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "தொடர�பை தட�க�கவ�ம� (_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_C அரட�டை"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_S எஸ�எம�எஸ�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "(_A) ஒலி அழைப�ப�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "(_V) விடியோ அழைப�ப�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "(_P) ம�ந�தைய உரையாடல�கள�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "கோப�ப� � அன�ப�ப�க"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "என� மேல�மேசையை பகிர�ந�த� கொள�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "பிடித�தமான"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "க�னோம�-தொடர�ப�கள� நிற�வப�படவில�லை"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "தொடர�ப� விவரங�கள�க�க� க�னோம� தொடர�ப�களை நிற�வவ�ம�."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "(_m) தகவல�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "திர�த�த� (_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_L தொடர�ப�கள� � தொட�..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "இந�த அறைக�க� அழைப�ப�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_I அரட�டை அறைக�க� அழைப�ப�"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "(_A) தொடர�பை  சேர�."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "_B நீக�க� மற�ற�ம� தட�"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "நீங�கள� நிச�சயம� க�ழ� '%s' � நீக�க விர�ம�ப�கிறீர�களா?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "க�ழ�வை நீக�க�தல�"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "நீக�கவ�ம� (_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "நீங�கள� நிச�சயம� தொடர�ப� '%s' � நீக�க விர�ம�ப�கிறீர�களா?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2229,7 +2201,11 @@ msgstr ""
 "நீங�கள� நிச�சயமாக சங�கிலித� தொடர�ப� '%s' � நீக�க விர�ம�ப�கிறீர�களா? இந�த தொடர�ப�டன�சங�கிலி "
 "போல� இணைந�த அனைத�த� தொடர�ப�கள�ம� நீக�கப�பட�ம� என� அறிக."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "தொடர�ப� � நீக�க�தல�"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2244,19 +2220,19 @@ msgstr "<b>இடம�</b> (date) போத�"
 msgid "Online from a phone or mobile device"
 msgstr "ஒர� தொலை பேசியில� இர�ந�தோ அல�லத� அலை பேகியில� இர�ந�தோ இணைப�பில� தொடர�ப�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "ப�திய வலையமைப�ப�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "ஒர� IRC வலைப�பின�னல� � தேர�ந�தெட�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_N வலைப�பின�னல� பட�டியலை மீட�டமைக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "தேர�வ� செய�க "
@@ -2269,177 +2245,135 @@ msgstr "ப�திய சேவையகம�"
 msgid "SSL"
 msgstr "எஸ�எஸ�எல�"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "தொடர�ப�கள� � தொட�"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_U தொட�ப�பை விலக�க�..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "காட�டப�பட�ட தொடர�ப�களில�  உள�ள தொடர�ப�களை தனிதனி தொடர�ப�களாக ம�ழ�க�க பகிரவ�ம�."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_L தொட�ப�ப�"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "தொடர�ப� '%s' இன�  இணைப�ப�களை நீக�கவா?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"நீங�கள� நிச�சயமாக இந�த சங�கிலி தொடர�பை நீக�க வேண�ட�மா? இத� இணைத�த தொடர�ப�களை தனித�தனி "
-"தொடர�ப�களாக ம�ழ�க�க பகிர�ந�த�விட�ம�."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_U இணைப�பை விலக�க�"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "வரலாற�"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "காட�ட�"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "தேட�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s இல� அரட�டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s உடன� அரட�டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s வினாடி"
 msgstr[1] "%s வினாடிகள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s நிமிடம�"
 msgstr[1] "%s நிமிடங�கள� "
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "அழைப�ப� எட�த�த�க�கொண�டத� %s, ம�டிந�தத� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "இன�ற�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "நேற�ற�"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "எப�போத� வேண�ட�மானால�ம�"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "யார� வேண�ட�மானால�ம�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "யார�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "எப�போத�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "எத� வேண�ட�மானால�ம�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "உரை அரட�டைகள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "உள�வர�ம� அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "வெளி செல�ல�ம� அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "தவறிய அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "எத�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ம�ந�தைய உரையாடல�கள� பதிவ�கள� அனைத�தைய�ம� நிச�சயம� நீக�க வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "அனைத�தைய�ம� த�டை"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "இலிர�ந�த� நீக�க�:"
 
@@ -2462,13 +2396,12 @@ msgstr "வரிவ�ர�"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "வீடியோ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "திர�த�த� (_E)"
 
@@ -2480,36 +2413,82 @@ msgstr "கோப�ப� (_F)"
 msgid "page 2"
 msgstr "பக�கம� 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "தொடர�ப� �டி (ID):"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "தொடர�பாளர� இணைப�ப� விலகி உள�ளார�"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "(_h) அரட�டை"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "க�றிப�பிட�ட தொடர�ப� செல�ல�படி ஆகாதத� அல�லத� தெரியாதத�"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "இந�த தொடர�ப� இந�த உரை வகை உரையாடலை ஆதரவில�லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "இந�த நெறிம�றையில� கேட�கப�பட�ட செயலம�சம� நடைம�றையாக�கவில�லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "கொட�த�த தொடர�ப�டன� ஒர� உரையாடலை த�வக�க ம�டியவில�லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "இந�த ஓடையில� இர�ந�த� நீங�கள� தடை செய�யப�பட�டீர�கள�"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "இந�த ஓடை நிரம�பியத�"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "இந�த ஓடையில� சேர நீங�கள� அழைக�கப�பட வேண�ட�ம�."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "தொடர�ப� த�ண�டிக�கப�பட�ட நிலையில� தொடர ம�டியாத�"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "அன�மதி மற�க�கப�பட�டத�"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "அழைப�பை த�வக�க�ம� போத� ஒர� பிழை நேர�ந�தத�."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "தொடர�ப� அடையாளம� காணி அல�லத� தொலைபேசி எண�ணை உள�ளிட�க:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "ப�திய உரையாடல�"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "_V விடியோ அன�ப�ப�"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_V விடியோ அழைப�ப�"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "(_a) அழை"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_A ஒலி அழைப�ப�"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "ப�திய அழைப�ப�"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> கணக�க�க�க� உற�தி செய�தல� தோல�வி"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2546,12 +2525,8 @@ msgstr "இநà¯�த நிலை பிடிதà¯�த நிலையாக à®
 msgid "Set status"
 msgstr "நிலையை அமை"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "உங�கள� நடப�ப� நிலையைய�ம� இர�ப�பையௌம� அமை "
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "தனிப�பயன� செய�திகள�"
 
@@ -2559,7 +2534,7 @@ msgstr "தனிப�பயன� செய�திகள�"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "ப�திய %s கணக�க�"
@@ -2628,12 +2603,12 @@ msgstr "க�ரல� அழைப�ப� ம�டிந�தத�"
 msgid "Edit Custom Messages"
 msgstr "தனிப�பயன� செய�திகளை திர�த�த�க"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "செய�தி திர�த�தப�பட�டத�  %s இல� "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "இயல�பான"
 
@@ -2708,41 +2683,45 @@ msgid "Certificate hostname: %s"
 msgstr "சான�றிதழ� ப�ரவலன� பெயர�: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "தொடரவ�ம�"
+msgid "C_ontinue"
+msgstr "_o தொடரவ�ம�"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "நம�பிக�கை இல�லாத இணைப�ப�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "இந�த இணைப�பை நம�ப இயலாத�. எப�படிய�ம� தொடர வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "எஹிர�கால இணைப�ப�கள�க�க� இந�த தேர�வை நினைவில� இர�த�தவ�ம�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "சான�றிதழ� விவரங�கள�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "யூஆர�� � திறக�க ம�டியவில�லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "கோப�பை தேர�வ� செய�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "கோப�பை சேமிக�க போத�மான காலி இடம� இல�லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "இந�த கோப�பை சேமிக�க %s காலி இடம� தேவை, ஆனால� %s மட�ட�மே கிடைக�கிறத�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� கோப�ப�"
@@ -2914,39 +2893,31 @@ msgstr "மேற�க� மொழி"
 msgid "Vietnamese"
 msgstr "வியட�னாம�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�பாளர� கோப�ப�களை பெற ம�டியாத�"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�பாளர� இணைப�ப� விலகி உள�ளார�"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "பிழை செய�தி இல�லை"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "உடனடி செய�தி (எம�பதி)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "த�வங�க�ம�போத� இணைக�க வேண�டாம�"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "த�வங�க�ம�போத� தொடர�ப� பட�டியலையோ அல�லத� வேற� உரையாடல�களோ காட�ட வேண�டாம�"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM கிளையன�"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr " கணக�க� மேலாளரை தொடர�ப� கொள�வதில� பிழை"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2990,230 +2961,88 @@ msgstr ""
 "வேண�ட�ம�. இல�லையானால� கீழ� கண�ட ம�கவரிக�க� கடிதம� எழ�தவ�ம�. Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "க�னோம�க�க� ஒர� உடனடி செய�தியாளர� சார�ந�தோன�."
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>. Dr. T. Vasudevan <agnihot3@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "கணக�க�களை இறக�க�ம� போத� ஒர� பிழை."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "கணக�க� விவரங�களை பக�க�க�ம� போத� ஒர� பிழை."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "கணக�கை உர�வாக�க�ம� போத� ஒர� பிழை."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "அங�கே ஒர� பிழையாக �ற�பட�டத�."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "பிழை செய�தி: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"நீங�கள� பின�னால�ம� சென�ற� மற�ற�ம� உங�களத� கணக�க�களின� விவரங�களை மீண�ட�ம� உள�ளிட ம�யற�சிக�கலாம� "
-"அல�லத� இந�த வழிகாட�டியை நிற�த�தலாம� மற�ற�ம� மென�வை திர�த�த�வதில�ர�ந�த� பின�னர� கணக�க�களை "
-"சேர�க�கலாம�."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "ஒர� பிழை �ற�பட�டத�"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "எந�த வகையான அரட�டை கணக�கை நீங�கள� பெற�றிர�க�கிறீர�கள�?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "நீங�கள� அமைக�க விர�ம�ப�வதற�க� உங�கள�க�க� �தேன�ம� மற�ற அரட�டை கணக�க�கள� இர�க�கிறதா?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "உங�களத� கணக�க� விவரங�களை உள�ளிடவ�ம�"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "எந�த வகையான அரட�டை கணக�கை நீங�கள� உர�வாக�க விர�ம�ப�கிறீர�கள�?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "மற�ற அரட�டை கணக�க�களை உர�வாக�க நீங�கள� விர�ம�ப�கிறீர�களா?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "ப�திய கணக�கிற�க� விவரங�களை உள�ளிடவ�ம�"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"எம�பதி (Empathy ) உடன� நீங�கள� ஆன�லைனில� அர�கிலிர�க�க�ம� மக�கள� மற�ற�ம� நண�பர�கள� மற�ற�ம� "
-"Google Talk, AIM, Windows Live போன�றவற�றை பயன�ற�ற�பட�த�தி மற�ற�ம� மற�ற பல அரட�டை "
-"நிரல�களில� இர�க�க�ம� கொலிக�ஸ� உடன� அரட�டை அடிக�கலாம�. மைக�ரோ போன� அல�லத� வெப�கேமிராவினால� "
-"நீங�கள�ம� ஆடியோ அல�லத� வீடியோ அழைப�ப�களை பெறலாம�. "
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "மற�ற அரட�டை நிரலை பயன�பட�த�திக� கொண�டிர�க�கிற உங�கள�க�க� ஒர� கணக�க� உள�ளதா?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ஆம�, எனத� கணக�க� விவரங�களை இதிலிர�ந�த� இறக�கவ�ம� "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ஆம�, இப�போத� எனத� கணக�க� விவரங�களை உள�ளிட�கிறேன�"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "இல�லை, எனக�க� ஒர� ப�திய கணக�க� வேண�ட�ம�"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "இல�லை, இப�போத� ஆன�லைனில� எனக�க� அர�கிலிர�க�க�ம� மக�களை நான� பார�க�க விர�ம�ப�கிறேன�"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "நீங�கள� இறக�க விர�ம�ப�ம� கணக�க�களை தேர�ந�தெட�க�கவ�ம�:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ஆம�"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "இல�லை, இப�போதைக�க� அவ�வளவ� தான�"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"எம�பதியால� தானியங�கியாக உங�களைப�போலவே உள� வலையில� உள�ளோரை கண�ட� பிடித�த� அரட�டை அடிக�க "
-"இயல�ம�. இந�த அம�சத�தை நீங�கள� செயலாக�க விர�ம�பினால� கீழ� கண�ட�ள�ள விவரங�களை சரி பார�க�கவ�ம�. "
-"கணக�க� உரையாடல� மூலம� நீங�கள� இந�த விவரங�களை ச�லபமாக மாற�றலாம� அல�லத� இந�த அம�சத�தை செயல� "
-"நீக�கலாம�."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr " திர�த�த�க->கணக�க�கள�"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_n இல�லை, இப�போத� இந�த அம�சத�தை செயலாக�க விர�ம�பவில�லை"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"டெலிபதி-சல�ட� நிற�வப�படவில�லை. அதனால� உள� வலையில� இணைந�த�ள�ள மக�கள�டன� நீங�கள� அரட�டையடிக�க "
-"இயலாத�. இந�த அம�சத�தை நீங�கள� செயலாக�க விர�ம�பினால� டெலிபதி-சல�ட� நிற�வ�ங�கள�. மேல�ம� "
-"கணக�க� உரையாடல� மூலம� அண�மையில� உள�ளோர� கணக�க� ஒன�ற� த�வக�கவ�ம�. "
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "டெலிபதி-சல�ட� நிற�வப�படவில�லை"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள� உதவியாளர�"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "எம�பதிக�க� வரவேற�ப�"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "உங�களிடம� இர�க�கிற கணக�க�களை இறக�கவ�ம�"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "தயை செய�த� சொந�த விவரங�களை உள�ளிட�க"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "சேமிக�கப�படாத மாற�றங�கள� உங�கள� %s கணக�கில� உள�ளன."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "உங�கள� கணக�க� இன�ன�ம� சேமிக�கப�படவில�லை"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "இணைக�கிறத�"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "இணைப�ப� விலகி — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "த�ண�டிக�கபட�டத� — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "இணைப�ப� விலகி — வலைப�பின�னல� இணைப�ப� இல�லை"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "தெரியாத நிலை"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"இந�த கணக�க� பழைய ஆதரவில�லாத பின�ப�லத�தை சார�ந�த� இர�ப�பதால� செயல� நீக�கப�பட�டத�. இந�த கணக�கை "
+"இடம� மாற�ற டெலிபதி-ஹேஸ� � நிற�வி அமர�வை மற� த�வக�கம� செய�யவ�ம�."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "இணைப�ப� விலகி —கணக�க� ம�டக�கப�பட�டத�"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"நீங�கள� ப�திய கணக�கை த�வக�கப�போகிறீர�கள�!அத� உங�கள� \n"
-"மாற�றங�களை விலக�கிவிட�ம�. நிச�சயம� தொடர வேண�ட�மா?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "இணைப�ப� அளப�ர�ப�களை திர�த�த�க"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "சேவையகத�தில� இர�ந�த� உங�கள� சொந�த தகவல�களை மீட�பத� தோல�விய�ற�றத�."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "இணைப�பில� சென�ற� உங�கள� சொந�த தகவல�களை திர�த�த�க"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_E இணைப�ப� அளவ�ர�க�களை திர�த�த�..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "நீங�கள� நிச�சயம� க�ழ� '%s' � உங�கள� கணினியிலிர�ந�த� நீக�க விர�ம�ப�கிறீர�களா?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "இத� உங�கள� கணக�கை சேவையகத�தில� இர�ந�த� நீக�காத�"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3222,15 +3051,23 @@ msgstr ""
 "மாற�றங�களை விலக�கிவிட�ம�. நிச�சயம� தொடர வேண�ட�மா?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "செயல�பட�த�த� (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "செயல� நீக�க� (_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_S தவிர�"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_C இணைக�கப�பட�டத�"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3247,14 +3084,10 @@ msgid "Loading account information"
 msgstr "கணக�க� தகவல� தகவல�கள� �ற�றப�பட�கின�றன"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "நெறிம�றைகள� �த�ம� நிற�வவில�லை"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "விதிம�றை:"
+msgid "No protocol backends installed"
+msgstr "நெறிம�றை பின�ப�லங�கள� �த�ம� நிற�வவில�லை"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3262,214 +3095,23 @@ msgstr ""
 "ஒர� ப�திய கணக�க� த�வக�க ஒவ�வொர� நெறிம�றைக�க�ம� நீங�கள� ம�தலில� ஒர� பின�ப�லத�தை அமைக�க "
 "வேண�ட�ம�."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_I இறக�க�மதி செய�"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- எம�பதி உற�தி செய�தல� சார�ந�தோன�"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "- எம�பதி உற�தி செய�தல� சார�ந�தோன�"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "அர�கில� உள�ள மக�கள�"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
-msgid "- Empathy Audio/Video Client"
-msgstr "- எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
-msgid "Empathy Audio/Video Client"
-msgstr "எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
-
-#: ../src/empathy-streamed-media-window.c:431
-msgid "Contrast"
-msgstr "வேற�பாட�"
-
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Brightness"
-msgstr "வெளிச�சம�"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Gamma"
-msgstr "காமா"
-
-#: ../src/empathy-streamed-media-window.c:542
-msgid "Volume"
-msgstr "ஒலி அளவ�"
-
-#: ../src/empathy-streamed-media-window.c:1110
-msgid "_Sidebar"
-msgstr "பக�கப�பட�டை(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1130
-msgid "Audio input"
-msgstr "ஒலி உள�ளீட�"
-
-#: ../src/empathy-streamed-media-window.c:1134
-msgid "Video input"
-msgstr "வீடியோ உள�ளீட�"
-
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Dialpad"
-msgstr "டயல� அட�டை"
-
-#: ../src/empathy-streamed-media-window.c:1151
-msgid "Details"
-msgstr "விவரங�கள�"
-
-#. translators: Call is a noun and %s is the contact name. This string
-#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
-#, c-format
-msgid "Call with %s"
-msgstr "%s ஆல� அழை "
-
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
-msgid "The IP address as seen by the machine"
-msgstr "கணினி பார�த�தபடி �பி ம�கவரி"
-
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
-msgid "The IP address as seen by a server on the Internet"
-msgstr "இணையத�தில� இர�ந�த� சேவயகம� பார�த�தபடி �பி ம�கவரி"
-
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
-msgid "The IP address of the peer as seen by the other side"
-msgstr "மற�ற பக�கத�தில� இர�ந�த� பார�த�தபடி பியரின� �பி ம�கவரி"
-
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
-msgid "The IP address of a relay server"
-msgstr "மேலன�ப�ப� சேவையகத�தின� �பி ம�கவர�."
-
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
-msgid "The IP address of the multicast group"
-msgstr "பல�வெளியீட�ட� க�ழ�வின� �பி ம�கவரி"
-
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "இணைக�கப�பட�டத� — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
-msgid "Technical Details"
-msgstr "தொடர�ப� விவரங�கள�"
-
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s' இன� மென�பொர�ள� உங�கள� கணினியில� ஆதரவ� உள�ள எந�த ஒலி இசை ஒழ�ங�க�களைய�ம� ப�ரிந�த� "
-"கொள�ளவில�லை"
-
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s' இன� மென�பொர�ள� உங�கள� கணினியில� ஆதரவ� உள�ள எந�த விடியோ ஒழ�ங�க�களைய�ம� ப�ரிந�த� "
-"கொள�ளவில�லை"
-
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-" %s' க�க� ஈனைக�க ம�டியவில�லை. உங�களில� ஒர�வர� நேரடி இணைப�பை அன�மதிக�காத வலைப�பின�னலில� "
-"இர�க�கலாம�."
-
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
-msgid "There was a failure on the network"
-msgstr "வலைப�பின�னலில� ஒர� தோல�வி"
-
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "இந�த அழைப�ப�க�க� தேவையான ஒலி ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
-
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "இந�த அழைப�ப�க�க� தேவையான விடியோ ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
-
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"டெலிபதி உட�கூற� ஒன�றில� எதிர�பாராத ஒன�ற� நிகழ�ந�தத�. தயைசெய�த� <a href=\"%s\">report "
-"this bug</a> மேல�ம� உதவி பட�டியலில� உள�ள 'Debug' சாளரத�தில� காண�ம� பதிவேட�ட� "
-"உள�ளடக�கத�தை இணைக�கவ�ம�.."
-
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
-msgid "There was a failure in the call engine"
-msgstr "அழைப�ப� பொறியில� ஒர� தோல�வி"
-
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
-msgid "The end of the stream was reached"
-msgstr "ஓடையின� இற�தி எட�டப�பட�டத�"
-
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
-msgid "Can't establish audio stream"
-msgstr "ஒலி ஓடையை நிற�வ ம�டியவில�லை"
-
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
-msgid "Can't establish video stream"
-msgstr "விடியோ ஓடையை நிற�வ ம�டியவில�லை"
-
 #: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "கேட�பொலி"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
 msgid "Decoding Codec:"
 msgstr "க�றிம�றை மீளாக�கம�:"
 
@@ -3482,22 +3124,18 @@ msgid "Display the dialpad"
 msgstr "டயல� பட�டியை காட�ட� "
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Encoding Codec:"
 msgstr "க�றிம�றை க�றிம�றையாக�கம�:"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
 msgid "Hang up"
 msgstr "த�ண�டி"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Hang up current call"
 msgstr "நடப�ப� அழைப�பை த�ண�டி"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Local Candidate:"
 msgstr "உள�ளமை வேட�பாளர�:"
 
@@ -3510,12 +3148,10 @@ msgid "Minimise me"
 msgstr "என�னை க�றைவாக�க�"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "தொலை வேட�பாளர�:"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "ஒலி அன�ப�ப� "
 
@@ -3540,7 +3176,6 @@ msgid "Swap camera"
 msgstr "காமிராவை மாற�ற�"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "ஒலி அன�ப�ப�தலை நிலை மாற�ற�"
 
@@ -3548,10 +3183,9 @@ msgstr "ஒலி அன�ப�ப�தலை நிலை மாற�ற�
 msgid "Toggle video transmission"
 msgstr "விடியோ அன�ப�ப�தலை நிலை மாற�ற�"
 
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+#: ../src/empathy-call-window.ui.h:21 ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538 ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "தெரியாத"
 
@@ -3560,7 +3194,6 @@ msgid "Video call"
 msgstr "விடியோ அழைப�ப�"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "(_C) அழை"
 
@@ -3569,17 +3202,17 @@ msgid "_Camera"
 msgstr "_C கேமரா "
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "உள�ளடக�கங�கள� (_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "(_D) வழ� நீக�க�"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "உதவி (_H)"
 
@@ -3592,51 +3225,98 @@ msgid "_Settings"
 msgstr "_S அமைப�ப�கள�"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_View"
 msgstr "பார�வை (_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "இந�த சாளரத�தை மூடவா?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"இந�த சாளரத�தை மூடினால�%s � விட�ட� வெளியேற�வீர�கள�.  நீங�கள� மற� ந�ழைவ� செய�ய�ம� வரை "
+"அங�கிர�ந�த� எந�த செய�திய�ம� இனி வராத�."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"இந�த சாளரத�தை மூடினால� ஒர� அரட�டை அறையை விட�ட� வெளியேற�வீர�கள�.  நீங�கள� மற� ந�ழைவ� "
+"செய�ய�ம� வரை அங�கிர�ந�த� எந�த செய�திய�ம� இனி வராத�."
+msgstr[1] ""
+"இந�த சாளரத�தை மூடினால� %u அரட�டை அறைகளை விட�ட� வெளியேற�வீர�கள�.  நீங�கள� மற� ந�ழைவ� "
+"செய�ய�ம� வரை அங�கிர�ந�த� எந�த செய�திய�ம� இனி வராத�."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s � விட�ட� வெளியேறவா?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"நீங�கள� இந�த அரட�டை அறையில� மற� ந�ழைவ� செய�ய�ம� வரை இங�கிர�ந�த� எந�த செய�திய�ம� இனி வராத�"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "சாளரத�தை மூட�க"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "அறையை விட�ட� வெளியேற�க"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d படிக�காதத�)"
 msgstr[1] "%s (%d படிக�காதத�)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (மற�ற�ம� %u மற�றவர�)"
 msgstr[1] "%s (மற�ற�ம� %u மற�றவர�கள�)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d மற�றவரிடம� இர�ந�த� படிக�காதத�)"
 msgstr[1] "%s (%d மற�றவரிடம� இர�ந�த� படிக�காதவை)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d எல�லோரிடமிர�ந�த�ம� படிக�காதத�)"
 msgstr[1] "%s (%d எல�லோரிடமிர�ந�த�ம� படிக�காதத�)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "எஸ�எம�எஸ�:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d செய�தி அன�ப�ப�கிறத�"
 msgstr[1] "%d செய�திகள� அன�ப�ப�கிறத�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "செய�திகள� தட�டச�சிடல�"
 
@@ -3716,96 +3396,95 @@ msgstr "தானியங�கி இணை"
 msgid "Manage Favorite Rooms"
 msgstr "பிடித�தமான அறைகளை மேலாள"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "உள�வர�ம� விடியோ அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "உள�வர�ம� அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s உங�கள�க�க� விடியோ அழைப�ப� கொட�க�கிறார�. நீங�கள� பதில� பேச வேண�ட�மா?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s உங�களை அழைக�கிறார�. நீங�கள� பதில� பேச வேண�ட�மா?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "(_R) �ற�காதே"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "(_A) பதிலளி"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
 msgstr "_A வீடியோவால� பதில� கொட�"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� விடியோ அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "அறை அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s இல� சேர உங�களை அழைத�த�ள�ளார�"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s உங�களை %s உடன� சேர அழைக�கிறார�."
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:800
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s  %s இல� சேர உங�களை அழைத�த�ள�ளார�"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s இல� சேர உங�களை அழைத�த�ள�ளனர�"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� கோப�ப� பரிமாற�றம�."
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "கடவ�ச�சொல� தேவைப�பட�கிறத�"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s நீங�கள� இணைப�பில� இர�க�க�ம� போத� காண அன�மதி வேண�ட�கிறார�. "
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3815,105 +3494,105 @@ msgstr ""
 "செய�தி: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s %sல� %s/s இல�"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s %sல� "
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr " \"%s\" � %s இடமிர�ந�த� பெற�கிறத�"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" � %s க�க� அன�ப�ப�கிறத�"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr " \"%s\" � %s இடமிர�ந�த� பெற�கையில� பிழை"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "கோப�ப� பெற�கையில� பிழை"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" � %s க�க� அன�ப�ப�கையில� பிழை"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "கோப�ப� அன�ப�ப�வதில� பிழை"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\"  %s இடமிர�ந�த� கிடைத�தத�"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" %s க�க� அன�ப�பப�பட�டத�"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "கோப�ப� பறிமாற�றம� ம�டிந�தத�"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "மற�ற பங�கேற�பாளரின� பதில�க�க� காத�திர�த�தல�"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr " \"%s\" இன� நம�பகத�தன�மையை சோதிக�கிறத�"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr " \"%s\" இன� ஹாஷ� மதிப�பை கணக�கிட�கிறத�"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "கோப�ப�"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "மீதம�ள�ளவை"
 
@@ -3927,7 +3606,11 @@ msgstr ""
 "பூர�த�தியானத�, ரத�த� செய�யப�பட�டத�, தோல�வி அடைந�தத� ஆகிய கோப�ப� பரிமாற�றங�களை பட�டியலில� "
 "இர�ந�த�  நீக�க� "
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_I இறக�க�மதி செய�"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3935,171 +3618,195 @@ msgstr ""
 "கணக�க�கள� �த�ம� இறக�க�மதி செய�ய இல�லை. எம�பதி இப�போதைக�க� பிட�ஜின� இலிர�ந�த� மட�ட�மே "
 "இறக�க�மதிகளை அன�மதிக�கிறத�."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "இறக�க�மதி செய� கணக�க�கள�"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "இறக�க�மதி செய�"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "விதிம�றை"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "மூலம�"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "கடவ�ச�சொல� � தா"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "த�ண�டி"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "தொடர�ப�களை இங�கே காண நீங�கள� ஒர� கணக�கை த�வக�க வேண�ட�ம�."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "பொர�த�தம�  �த�ம� காணப�படவில�லை"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "மன�னிக�க, %s கணக�க�கள� உங�கள� %s மென�பொர�ள� மேம�பட�த�தப�பட�ம� வரை பயன�பட�த�த இயலாத�."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "மென�பொர�ளை மேம�பட�த�த�..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "மூட�"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "மீள� இணை"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "கணக�க�களை திர�த�த�க"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "மூட�"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "நிரப�ப� %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "கணக�க� இர�ப�பை நிரப�ப�"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "நிரப�ப�..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "தொடர�ப�"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "தொடர�ப�களை இங�கே காண நீங�கள� உங�களத� ஒர� கணக�கை செயலாக�க வேண�ட�ம�."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "தொடர�ப�களை இங�கே காண நீங�கள�  %s � செயலாக�க வேண�ட�ம�."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "தொடர�ப� பட�டியல�"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "கணக�க� அமைப�ப�கள�"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "(_M) தொடர�ப�களை படத�தில� காட�ட� "
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "கட�டண மீதம�"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "தொடர�ப� பட�டியல� இல� காண�க "
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "(_F) விர�ப�பங�கள� சேர� "
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "விர�ப�பங�களை மேலாள�க"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr " (_o) சாதாரண அளவ�"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_C ப�திய அழைப�ப�"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "( _A) சாதாரண அளவ� அவதாரங�கள� உடன�"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "(_r) விர�ப�பங�கள�"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_r விதிம�றைகளை காட�ட�"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "(_N) பெயர� ஆல� வரிசைப�பட�த�த�"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "(_S) நிலை வாரியாக வரிசைப�பட�த�த�"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "கணக�க�கள� (_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_B தட�க�கப�பட�ட தொடர�ப�கள�"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "(_C) அடக�கமான அளவ�"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "(_F) கோப�ப� பறிமாற�றங�கள� "
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_N ப�திய உரையாடல�"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "(_O) இணைப�ப� விலகி உள�ள தொடர�ப�கள�"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "(_P) தனிப�பட�ட தகவல�"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "(_R) அறை"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_S தொடர�ப�கள� � தேட�..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "அரட�டை அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "உற�ப�பினர�கள�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4112,16 +3819,21 @@ msgstr ""
 "கடவ�ச�சொல� தேவை: %s\n"
 "உற�ப�பினர�கள�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ஆம�"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "இல�லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "அறை பட�டியலை எட�ப�பதை த�வக�க ம�டியவில�லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "அறை பட�டியலை எட�ப�பதை நிற�த�த ம�டியவில�லை"
 
@@ -4155,79 +3867,79 @@ msgstr "அறை பட�டியல�"
 msgid "_Room:"
 msgstr "(_R) அறை:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "தகவல� பெறப�பட�டத�"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "தகவல� அன�ப�பப�பட�டத�"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "ப�திய உரையாடல�"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "தொடர�ப� இணைபில� வர�கிறார�"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "தொடர�ப� இணைப�பில� வர�கிறார�"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "தொடர�ப� இணைப�ப� விலகி செல�கிறார�"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "கணக�க� இணைக�கப�பட�டத�"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "கணக�க� இணைப�ப� நீக�கப�பட�டத�"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "மொழி"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "ஜூலியட�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ரோமியோ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ஓ ரோமியோ ரோமியோ எங�கிர�க�கிறாய� ரோமியோ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "உங�கள� தந�தையை மற� மற�ற�ம� உன� பெயரை விலக�க�;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "மாட�டாய� என�றால� என� காதலை சத�தியம� செய�கிறேன�"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "அப�ப�றம� நான� கேப�லெட� ஆக இர�க�க மாட�டேன�"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "இன�ன�ம� கேட�க ம�டிய�மா அல�லத� இத�போல� பேசவா? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "ஜூலியட� தொடர�பை த�ண�டித�தார�"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "விர�ப�பங�கள�"
 
@@ -4286,35 +3998,27 @@ msgstr "மொழிகள�க�க� எழ�த�த� பிழை த
 msgid "General"
 msgstr "பொத�"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "உள�ளீட�ட� மட�டம�:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "உள�ளீட� ஒலி அளவ�:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "இட மூலங�கள�:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "உரையாடல�களை பதிவேட�டில� க�றி"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "அறிவிப�ப�கள�"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "நிகழ�வ�கள�க�க� ஒலியை இயக�க�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "அந�தரங�கம�"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4323,23 +4027,27 @@ msgstr ""
 "க�றைத�த இட க�றிப�ப� எனில� உங�கள� மாநகரம�, மாநிலம�, நாட� தவிர ஒன�ற�ம� வெளியிடப�படாத�. "
 "ஜிபிஎஸ� ஆயத�தொலைவ�கள�க�க� 1 தசம இடம� திர�த�தமாக இர�க�க�ம�."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "(_s) சிரிப�பான�களை பிம�பங�களாக காட�ட�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "(_l) அறைகளில� தொடர�ப� பட�டியல� � காட�ட� "
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "ஒலிகள�"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "எழ�த�த� பிழை திர�த�தம�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "அரட�டையை இதில� த�வங�க�:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4347,10 +4055,14 @@ msgstr ""
 "இந�த பட�டியல� நீங�கள� எந�த மொழிகள�க�க� அகராதி நிற�வி இர�க�கிறீர�களோ அவற�றை மட�ட�மே "
 "காட�ட�கிறத�"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "கர�த�த�கள�"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_e அழைப�ப� தரத�தை மேம�பட�த�த எதிரொலி நீக�கத�தை பயன�பட�த�த�க "
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "மாற�ற�:"
@@ -4380,18 +4092,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_N வலையமைப�ப� (�பி, வைஃபை)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "(_O) ப�திய அரட�டைகளை தனி சாளரங�களில� திற"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "(_P) என� தொடர�ப�கள�க�க� இடத�தை வெளியிட�"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "(_R) இடத�தின� க�றிப�பை க�றை"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr " _w ப�திய சாளரங�கள�"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_b ப�திய கீற�ற�கள�"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "நிலை"
@@ -4400,246 +4116,688 @@ msgstr "நிலை"
 msgid "_Quit"
 msgstr "வெளியேற� (_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "தொடர�பாளரை மீண�ட�ம� அழை"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "கேமரா செயலிலில�லை"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "கேமரா செயலில�"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "காமிராவை செயலிழக�கச� செய�த� விடியோ அன�ப�ப�வதை நிற�த�த�க."
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "காமிராவை செயலாக�கி விடியோ அன�ப�ப�க."
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "காமிராவை செயலாக�க�க; ஆனால� விடியோ அன�ப�ப வேண�டாம�."
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "ம�ன�பார�வை"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "மற� ம�யற�சி"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_i வீடியோ "
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "வீடியோ செயலில� இல�லை"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "வீடியோ செயலில� உள�ளத�"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ஒளித�தோற�ற ம�ன�னோட�டம�"
-
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "தொடர�ப�கள� படக�காட�சி"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "சேமி"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr "பேஸ�ட�பின� தொட�ப�ப�"
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr "பேஸ�ட�பின� எதிர�வினை"
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "தரவ� ஒற�றை ஒட�டல�க�க� மிகப�பெரியத�. பதிவை தயைசெய�த� கோப�ப�க�க� சேமிக�கவ�ம�."
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "வழ� நீக�க� சாளரம�"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr "பேஸ�ட�பின� க�க� அன�ப�ப� "
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "தாமதி"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "மட�டம�"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "வழ�நீக�க�"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
 msgstr "தகவல�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
 msgstr "செய�தி"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "எச�சரிக�கை"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ஆபத�தான"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr " பிழை"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "நேரம�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "களம�"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "வகை"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "மட�டம�"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "தேர�ந�தெட�த�த இணைப�ப� மேலாளர� தொலை வழ� நீக�கத�தை ஆதரிக�கவில�லை"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "பங�கேற�பாளரை அழை"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "உரையாடலில� பங�க�  கொள�ள ஒ ர� தொடர�பை  தேர�ந�தெட�க�கவ�ம�:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "அழை"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "எந�த  உரையாடலைய�ம�  காட�ட  வேண�டாம�,  வேலை  செய�ய   வேண�டாம� (-எ-கா இறக�க�மதி) மற�ற�ம� "
 "வெளியேற�க"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "அர�கில� உள�ள நபர�கள� கணக�க�கள�  இர�ப�ப� அல�லாத� வேற� எந�த  உரையாடலைய�ம�  காட�ட  "
 "வேண�டாம�,  "
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "கொட�த�த கணக�கை ம�தலில� தேர�வ� செய�யவ�ம� (eg, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "எம�பதி கணக�க�கள�"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "எம�பதி கணக�க�கள�"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "ஒர� க�றிப�பிட�ட சேவையை காட�ட�"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "-எம�பதி வழ� நீக�கி"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "எம�பதி வழ� நீக�கி"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "-எம�பதி அரட�டைசார�ந�தோன� "
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "பதிலளி"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "�ற�காதே"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "பதிலளி"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
 msgstr "வீடியோவால� பதில� கொட�"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "நிராகரி"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "�ற�ற�க�கொள�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:239
 msgid "Provide"
 msgstr "அளி"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s உங�களை அழைக�க விர�ம�பினார�, ஆனால� நீங�கள� வேற� அழைப�பில� இர�ந�தீர�கள�."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "%s ஆல� அழை "
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "கணினி பார�த�தபடி �பி ம�கவரி"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "இணையத�தில� இர�ந�த� சேவயகம� பார�த�தபடி �பி ம�கவரி"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "மற�ற பக�கத�தில� இர�ந�த� பார�த�தபடி பியரின� �பி ம�கவரி"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "மேலன�ப�ப� சேவையகத�தின� �பி ம�கவர�."
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "பல�வெளியீட�ட� க�ழ�வின� �பி ம�கவரி"
+
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "தற�காலிக நிற�த�தம�"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "ஒலி நிற�த�தம�"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "கால அளவ�"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:2987
+msgid "Technical Details"
+msgstr "தொடர�ப� விவரங�கள�"
+
+#: ../src/empathy-call-window.c:3026
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s' இன� மென�பொர�ள� உங�கள� கணினியில� ஆதரவ� உள�ள எந�த ஒலி இசை ஒழ�ங�க�களைய�ம� ப�ரிந�த� "
+"கொள�ளவில�லை"
+
+#: ../src/empathy-call-window.c:3031
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s' இன� மென�பொர�ள� உங�கள� கணினியில� ஆதரவ� உள�ள எந�த விடியோ ஒழ�ங�க�களைய�ம� ப�ரிந�த� "
+"கொள�ளவில�லை"
+
+#: ../src/empathy-call-window.c:3037
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+" %s' க�க� ஈனைக�க ம�டியவில�லை. உங�களில� ஒர�வர� நேரடி இணைப�பை அன�மதிக�காத வலைப�பின�னலில� "
+"இர�க�கலாம�."
+
+#: ../src/empathy-call-window.c:3043
+msgid "There was a failure on the network"
+msgstr "வலைப�பின�னலில� ஒர� தோல�வி"
+
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "இந�த அழைப�ப�க�க� தேவையான ஒலி ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
+
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "இந�த அழைப�ப�க�க� தேவையான விடியோ ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
+
+#: ../src/empathy-call-window.c:3062
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"டெலிபதி உட�கூற� ஒன�றில� எதிர�பாராத ஒன�ற� நிகழ�ந�தத�. தயைசெய�த� <a href=\"%s\">report "
+"this bug</a> மேல�ம� உதவி பட�டியலில� உள�ள 'Debug' சாளரத�தில� காண�ம� பதிவேட�ட� "
+"உள�ளடக�கத�தை இணைக�கவ�ம�.."
+
+#: ../src/empathy-call-window.c:3071
+msgid "There was a failure in the call engine"
+msgstr "அழைப�ப� பொறியில� ஒர� தோல�வி"
+
+#: ../src/empathy-call-window.c:3074
+msgid "The end of the stream was reached"
+msgstr "ஓடையின� இற�தி எட�டப�பட�டத�"
+
+#: ../src/empathy-call-window.c:3114
+msgid "Can't establish audio stream"
+msgstr "ஒலி ஓடையை நிற�வ ம�டியவில�லை"
+
+#: ../src/empathy-call-window.c:3124
+msgid "Can't establish video stream"
+msgstr "விடியோ ஓடையை நிற�வ ம�டியவில�லை"
+
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "உங�களை நடப�ப� வைப�ப�த�தொகை %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "மன�னிக�கவ�ம�, உங�கள� கணக�கில� அந�த அழைப�ப�க�க� போதிய பணமில�லை"
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "கட�டணம� செல�த�த�"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
+
+#: ../src/empathy-call.c:223
+msgid "Empathy Audio/Video Client"
+msgstr "எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_M பொர�த�த நிலை"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "எந�த வகையான அரட�டை கணக�கை நீங�கள� பெற�றிர�க�கிறீர�கள�?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "ப�திய கணக�கை சேர�க�கிறத�"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "அர�கில� உள�ள மக�கள�"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"எம�பதியால� தானியங�கியாக உங�களைப�போலவே உள� வலையில� உள�ளோரை கண�ட� பிடித�த� அரட�டை அடிக�க "
+"இயல�ம�. இந�த அம�சத�தை நீங�கள� செயலாக�க விர�ம�பினால� கீழ� கண�ட�ள�ள விவரங�களை சரி பார�க�கவ�ம�. "
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"தொடர�ப� பட�டியலில� <span style=\"italic\">Edit → Accounts</span> � தேர�ந�தெட�த�த� "
+"நீங�கள� இந�த விவரங�களை மாற�றலாம� அல�லத� இந�த அம�சத�தை செயல� நீக�கலாம�."
+
+#~ msgid "Call volume"
+#~ msgstr "அழைப�ப� ஒலி அளவ�"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "அழைப�ப� ஒலி அளவ�, சதவிகிதமாக."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "எம�பதி பட�டர�ப�ளை லாக�ஸ� இலிர�ந�த� இட மாற�றம� ஆகிவிட�டத�"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "எம�பதி பட�டர�ப�ளை லாக�ஸ� இலிர�ந�த� இட மாற�றம� ஆகிவிட�டதா? "
+
+#~ msgid "Socket type not supported"
+#~ msgstr "சொர�கி வாய� வகை க�க� ஆதரவில�லை"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "என� வலை கணக�க�கள� "
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s கணக�க� %s வழியாக திர�த�தப�பட வேண�ட�ம�."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s கணக�கை எம�பதிக�க� சேர�க�க�க இயலாத�. "
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "என� வலை கணக�க�கள� � த�வக�க�க. "
+
+#~ msgid "Edit %s"
+#~ msgstr "%s � திர�த�த�"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_n ரத�த�செய�க"
+
+#~ msgid "Personal Information"
+#~ msgstr "தனிப�பட�ட தகவல�"
+
+#~ msgid "Ungrouped"
+#~ msgstr "க�ழ�வில� சேர�க�காத "
+
+#~ msgid "Favorite People"
+#~ msgstr "பிடித�தமான நபர�கள� "
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "திர�த�த� (_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ஒர� தொடர�ப� � தேர�வ� செய�க"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "தொட�ப�பில� உள�ள தொடர�ப�கள�"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "தொட�ப�ப�க�க� தொடர�ப�களை  � தேர�வ� செய�க"
+
+#~ msgid "New contact preview"
+#~ msgstr "ப�திய தொடர�ப� ம�ன� பார�வை"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "இடத� பக�கம� உள�ள பட�டியலில� தெர�ந�தெட�த�த தொடர�ப�கள� ஒண�றாக இணைக�கப�பட�ம�."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_L தொடர�ப�கள� � தொட�..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "தொடர�ப�கள� � தொட�"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_U தொட�ப�பை விலக�க�..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "காட�டப�பட�ட தொடர�ப�களில�  உள�ள தொடர�ப�களை தனிதனி தொடர�ப�களாக ம�ழ�க�க பகிரவ�ம�."
+
+#~ msgid "_Link"
+#~ msgstr "_L தொட�ப�ப�"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "தொடர�ப� '%s' இன�  இணைப�ப�களை நீக�கவா?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "நீங�கள� நிச�சயமாக இந�த சங�கிலி தொடர�பை நீக�க வேண�ட�மா? இத� இணைத�த தொடர�ப�களை தனித�தனி "
+#~ "தொடர�ப�களாக ம�ழ�க�க பகிர�ந�த�விட�ம�."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_U இணைப�பை விலக�க�"
+
+#~ msgid "Contact ID:"
+#~ msgstr "தொடர�ப� �டி (ID):"
+
+#~ msgid "C_hat"
+#~ msgstr "(_h) அரட�டை"
+
+#~ msgid "Send _Video"
+#~ msgstr "_V விடியோ அன�ப�ப�"
+
+#~ msgid "C_all"
+#~ msgstr "(_a) அழை"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "உங�கள� நடப�ப� நிலையைய�ம� இர�ப�பையௌம� அமை "
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�பாளர� கோப�ப�களை பெற ம�டியாத�"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "தேர�ந�தெட�க�கப�பட�ட தொடர�பாளர� இணைப�ப� விலகி உள�ளார�"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "கணக�க�களை இறக�க�ம� போத� ஒர� பிழை."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "கணக�க� விவரங�களை பக�க�க�ம� போத� ஒர� பிழை."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "கணக�கை உர�வாக�க�ம� போத� ஒர� பிழை."
+
+#~ msgid "There was an error."
+#~ msgstr "அங�கே ஒர� பிழையாக �ற�பட�டத�."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "பிழை செய�தி: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "நீங�கள� பின�னால�ம� சென�ற� மற�ற�ம� உங�களத� கணக�க�களின� விவரங�களை மீண�ட�ம� உள�ளிட "
+#~ "ம�யற�சிக�கலாம� அல�லத� இந�த வழிகாட�டியை நிற�த�தலாம� மற�ற�ம� மென�வை திர�த�த�வதில�ர�ந�த� "
+#~ "பின�னர� கணக�க�களை சேர�க�கலாம�."
+
+#~ msgid "An error occurred"
+#~ msgstr "ஒர� பிழை �ற�பட�டத�"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr ""
+#~ "நீங�கள� அமைக�க விர�ம�ப�வதற�க� உங�கள�க�க� �தேன�ம� மற�ற அரட�டை கணக�க�கள� இர�க�கிறதா?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "உங�களத� கணக�க� விவரங�களை உள�ளிடவ�ம�"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "எந�த வகையான அரட�டை கணக�கை நீங�கள� உர�வாக�க விர�ம�ப�கிறீர�கள�?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "மற�ற அரட�டை கணக�க�களை உர�வாக�க நீங�கள� விர�ம�ப�கிறீர�களா?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "ப�திய கணக�கிற�க� விவரங�களை உள�ளிடவ�ம�"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "எம�பதி (Empathy ) உடன� நீங�கள� ஆன�லைனில� அர�கிலிர�க�க�ம� மக�கள� மற�ற�ம� நண�பர�கள� மற�ற�ம� "
+#~ "Google Talk, AIM, Windows Live போன�றவற�றை பயன�ற�ற�பட�த�தி மற�ற�ம� மற�ற பல அரட�டை "
+#~ "நிரல�களில� இர�க�க�ம� கொலிக�ஸ� உடன� அரட�டை அடிக�கலாம�. மைக�ரோ போன� அல�லத� "
+#~ "வெப�கேமிராவினால� நீங�கள�ம� ஆடியோ அல�லத� வீடியோ அழைப�ப�களை பெறலாம�. "
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "மற�ற அரட�டை நிரலை பயன�பட�த�திக� கொண�டிர�க�கிற உங�கள�க�க� ஒர� கணக�க� உள�ளதா?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ஆம�, எனத� கணக�க� விவரங�களை இதிலிர�ந�த� இறக�கவ�ம� "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ஆம�, இப�போத� எனத� கணக�க� விவரங�களை உள�ளிட�கிறேன�"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "இல�லை, எனக�க� ஒர� ப�திய கணக�க� வேண�ட�ம�"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr ""
+#~ "இல�லை, இப�போத� ஆன�லைனில� எனக�க� அர�கிலிர�க�க�ம� மக�களை நான� பார�க�க விர�ம�ப�கிறேன�"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "நீங�கள� இறக�க விர�ம�ப�ம� கணக�க�களை தேர�ந�தெட�க�கவ�ம�:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "இல�லை, இப�போதைக�க� அவ�வளவ� தான�"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr " திர�த�த�க->கணக�க�கள�"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_n இல�லை, இப�போத� இந�த அம�சத�தை செயலாக�க விர�ம�பவில�லை"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "டெலிபதி-சல�ட� நிற�வப�படவில�லை. அதனால� உள� வலையில� இணைந�த�ள�ள மக�கள�டன� நீங�கள� "
+#~ "அரட�டையடிக�க இயலாத�. இந�த அம�சத�தை நீங�கள� செயலாக�க விர�ம�பினால� டெலிபதி-சல�ட� "
+#~ "நிற�வ�ங�கள�. மேல�ம� கணக�க� உரையாடல� மூலம� அண�மையில� உள�ளோர� கணக�க� ஒன�ற� த�வக�கவ�ம�. "
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "செய�தி அன�ப�ப�தல� மற�ற�ம� வோய�ப� கணக�க�கள� உதவியாளர�"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "எம�பதிக�க� வரவேற�ப�"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "உங�களிடம� இர�க�கிற கணக�க�களை இறக�கவ�ம�"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "தயை செய�த� சொந�த விவரங�களை உள�ளிட�க"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "நீங�கள� ப�திய கணக�கை த�வக�கப�போகிறீர�கள�!அத� உங�கள� \n"
+#~ "மாற�றங�களை விலக�கிவிட�ம�. நிச�சயம� தொடர வேண�ட�மா?"
+
+#~ msgid "Protocol:"
+#~ msgstr "விதிம�றை:"
+
+#~ msgid "Contrast"
+#~ msgstr "வேற�பாட�"
+
+#~ msgid "Brightness"
+#~ msgstr "வெளிச�சம�"
+
+#~ msgid "Gamma"
+#~ msgstr "காமா"
+
+#~ msgid "Volume"
+#~ msgstr "ஒலி அளவ�"
+
+#~ msgid "_Sidebar"
+#~ msgstr "பக�கப�பட�டை(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ஒலி உள�ளீட�"
+
+#~ msgid "Video input"
+#~ msgstr "வீடியோ உள�ளீட�"
+
+#~ msgid "Dialpad"
+#~ msgstr "டயல� அட�டை"
+
+#~ msgid "Details"
+#~ msgstr "விவரங�கள�"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "இணைக�கப�பட�டத� — %d:%02dm"
+
+#~ msgid "_Personal Information"
+#~ msgstr "(_P) தனிப�பட�ட தகவல�"
+
+#~ msgid "Input level:"
+#~ msgstr "உள�ளீட�ட� மட�டம�:"
+
+#~ msgid "Input volume:"
+#~ msgstr "உள�ளீட� ஒலி அளவ�:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "(_O) ப�திய அரட�டைகளை தனி சாளரங�களில� திற"
+
+#~ msgid "Call the contact again"
+#~ msgstr "தொடர�பாளரை மீண�ட�ம� அழை"
+
+#~ msgid "Camera Off"
+#~ msgstr "கேமரா செயலிலில�லை"
+
+#~ msgid "Camera On"
+#~ msgstr "கேமரா செயலில�"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "காமிராவை செயலிழக�கச� செய�த� விடியோ அன�ப�ப�வதை நிற�த�த�க."
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "காமிராவை செயலாக�கி விடியோ அன�ப�ப�க."
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "காமிராவை செயலாக�க�க; ஆனால� விடியோ அன�ப�ப வேண�டாம�."
+
+#~ msgid "Preview"
+#~ msgstr "ம�ன�பார�வை"
+
+#~ msgid "Redial"
+#~ msgstr "மற� ம�யற�சி"
+
+#~ msgid "V_ideo"
+#~ msgstr "_i வீடியோ "
+
+#~ msgid "Video Off"
+#~ msgstr "வீடியோ செயலில� இல�லை"
+
+#~ msgid "Video On"
+#~ msgstr "வீடியோ செயலில� உள�ளத�"
+
+#~ msgid "Video Preview"
+#~ msgstr "ஒளித�தோற�ற ம�ன�னோட�டம�"
+
 #~ msgid "All"
 #~ msgstr "அனைத�த�"
 
diff --git a/po/te.po b/po/te.po
index 9516ee0b2..19464cb48 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,29 +1,29 @@
 # translation of empathy.master.te.po to Telugu
-# Copyright (C) 2011 Gnome Contributors
+# Copyright (C) 2012 Swecha localisation Team
 # This file is distributed under the same license as the empathy package.
 #
 #
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
 # Praveen Illa <mail2ipn@gmail.com>, 2011.
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2011.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2011
+# GVS.Giri <gvs.giri947@gmail.com>,2012.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-15 10:09+0000\n"
-"PO-Revision-Date: 2011-06-15 20:28+0530\n"
-"Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-10-09 06:09+0000\n"
+"PO-Revision-Date: 2012-01-31 19:11+0530\n"
+"Last-Translator:Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: te\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -47,429 +47,438 @@ msgid "Always open a separate chat window for new chats."
 msgstr "కొత�త చాట�‌లక� ఎల�లప�ప�డ� ఒక వేరే కొత�త చాట� విండోన� తెర�వ�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "కాల� ఘణపరిమాణమ�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "కాల� ఘణపరిమాణమ�, ఒక శాతమ�గా"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "కెమెరా స�థానమ�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"గ�ంప� చాట� నంద� నిక� కంప�లీషన� (ట�యాబ�) ఉపయోగిస�త�న�నప�ప�డ� మార�పేర� తర�వాత "
-"జతచేయవలసిన అక�షరమ�."
+"గ�ంప� చాట� నంద� నిక� కంప�లీషన� (ట�యాబ�) ఉపయోగిస�త�న�నప�ప�డ� మార�పేర� తర�వాత జతచేయవలసిన అక�షరమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "చాట� విండో థీమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
-msgstr "చాట� విండో థీమ�"
+msgstr "మాట�లాడ�కొన� కిటికీ (చాట� విండో) థీం మార�ప�ల�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"ఉపయోగించ�టక� కామాతో వేర�చేయబడివ�న�న అక�షరక�రమం తనిఖీచేయ� భాషల యొక�క జాబితా (ఉ."
-"దా. en, fr, nl)."
+"ఉపయోగించ�టక� కామాతో వేర�చేయబడివ�న�న అక�షరక�రమం తనిఖీచేయ� భాషల యొక�క జాబితా (ఉ.దా. en, fr, nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "కాంపాక�ట� పరిచయ జాబితా"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "అన�సంధాన నిర�వాహకాలన� తప�పక ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "పరిచయ జాబితా క�రమబద�దీకరణ విధానమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "వీడియో కాల�స� లో ఉపయోగించడానికి అప�రమేయ కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "అవతార బొమ�మన� ఎంచ�కొన�టక� అప�రమేయ డైరెక�టరీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "దూరంగా ఉన�నప�ప�డ� పాప�అప� ప�రకటనలన� అచేతనమ�చేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "దూరంగా ఉన�నప�ప�డ� శబ�దమ�లన� అచేతనమ� చేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "లోనికివచ�చ� ఘటనలన� స�థితి ప�రాంతమ�లో చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"లోనికివచ�చ� ఘటనలన� స�థితి ప�రదేశమ�లో చూపించ�. ఒకవేళ తప�పయినట�లయితే, వాడ�కరికి "
-"సత�వరమే చూపించ�."
+"లోనికివచ�చ� ఘటనలన� స�థితి ప�రదేశమ�లో చూపించ�. ఒకవేళ తప�పయినట�లయితే, వాడ�కరికి సత�వరమే చూపించ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "అతి ధ�వన�లన� నిర�మూలించడానికి సహకారం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "ఎంపతి వాడ�కరి యొక�క స�థానమ�న� ప�రచ�రించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి GPSన� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "స�థానమ�న� అంచనా వేయ�టక� ఎంపతి సెల�య�లర� నెట�‌వర�క�న� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "స�థానమ�న� అంచానావేయ�టక� ఎంపతి నెట�‌వర�క�న� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "ఎంపతి అప�రమేయ డౌన�‌లోడ� సంచయం"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "అభివృధ�ధి చెందిన సీతాకోక చిల�క లాగ� ల� ఎంపతి కలిగి వ�న�నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "ఎంపతి వాడ�కలో లేనప�డ� దూరంగా ఉన�నట�ట� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "ప�రారంభమ�లో ఎంపతి స�వయంగా-అన�సంధానించబడాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "స�థానమ� యొక�క ఖచ�చితత�వమ�న� ఎంపతి తప�పక తగ�గించవలెన�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ఎంపతి పరిచయం యొక�క అవతారమ�న� చాట� విండో ప�రతీక వలె ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "వెబ�‌కిట� అభివృద�ధికార�ని సాధనమ�లన� చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "కొత�త సందేశమ�ల� కొరక� పాప�అప� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "అక�షరక�రమం తనిఖీచేయ�దానిని చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "ప�రధాన విండోన� దాయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "ప�రధాన విండోన� దాయి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "మార�పేర�న� పూర�తిచేయ� అక�షరమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "కొత�త చాట�‌లన� వేర�వేర� విండోలలో తెర�వ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "ఉపయోగించ�టక� అడియమ� థీమ� యొక�క పాత�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"ఒకవేళ చాట�‌నక� ఉపయోగించిన థీమ� అడియమ� అయితే అడియమ� థీమ� వాడటానికి అవసరమగ� "
-"పాత�."
+msgstr "ఒకవేళ చాట�‌నక� ఉపయోగించిన థీమ� అడియమ� అయితే అడియమ� థీమ� వాడటానికి అవసరమగ� పాత�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "లోనికివచ�చ� సందేశమ�లక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "కొత�త సంభాషణలక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "బయటక�పోవ� సందేశమ�లక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "పరిచయం ప�రవేశించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "పరిచయం నిష�క�రమించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "మనమ� ప�రవేశించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "మనమ� నిష�క�రమించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "చాట� పై దృష�టి సారించకపోతే ప�రకటనలన� పైన చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "పరిచయం లాగిన� అయినప�ప�డ� ప�రకటనల� పైన చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "పరిచయం నిష�క�రమించినప�డ� ప�రకటనలన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "కెమెరా ఉపదర�శన స�థానమ� ఖచ�చితంగా కాల� మధ�యలో  ఉండవలెన�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "పరిచయ జాబితాలో సమత�ల�యతన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "అవతారమ�లన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "గద�లలో పరిచయ జాబితాన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "ప�రధాన విండోన� మూసివేయ�టక� సూచనన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "ఆఫ�‌లైన� పరిచయాలన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "ప�రోటోకాల�స�న� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "అక�షరక�రమ తనిఖీచేయ� భాషల�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "ఫైళ�ళ బదిలీకరణలన� వ�యవస�థలో భద�రపర�చ�టక� అప�రమేయ సంచయం."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "అవతారమ� బొమ�మన� ఎంచ�కోబడినట�వంటి ఆఖరి డైరెక�టరి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "చాట� విండో స�థానమ� పక�కపట�టీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "మటామంతీ(చాట�) కిటికీ ప�రక�కన పలక నిల�వ స�థానమ�(పిక�సెల� లలో)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� ఉపయోగించబడిన థీమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
-msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� ఉపయోగించబడిన థీమ�."
+msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� మార�ప�ల� చేయగలిగిన థీమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "గ�రాఫికల� చిర�నవ�వ�లన� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "ప�రకటిత శబ�దమ�లన� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "చాట� గద�ల కొరక� థీమ�న� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "వాడ�కరి ఉన�న స�థానమ�న� వారి పరిచయమ�లక� ఎంపతి ప�రచ�రించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి GPSన� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి సెల�య�లర� నెట�‌వర�క�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి నెట�‌వర�క�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "అభివృధ�ధి చెందిన సీతాకోక చిల�క లాగ� ల� ఎంపతి కలిగి వ�న�నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"ఎంపతి వ�యవస�థ ప�రారంభమ�లో మీ ఖాతాలలోనికి స�వయంచాలకంగా ప�రవేశించాలా వద�దా."
+msgstr "ఎంపతి వ�యవస�థ ప�రారంభమ�లో మీ ఖాతాలలోనికి స�వయంచాలకంగా ప�రవేశించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ఒకవేళ వాడ�కరి వాడక�ండా ఉంటే ఎంపతిని స�వయంచాలకంగా దూరంగా ఉన�న విధమ�లోనికి "
-"మార�చాలా వద�దా."
+msgstr "ఒకవేళ వాడ�కరి వాడక�ండా ఉంటే ఎంపతిని స�వయంచాలకంగా దూరంగా ఉన�న విధమ�లోనికి మార�చాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"గోప�యతా కారణాల దృష�ట�యా స�థానమ� యొక�క ఖచ�చితత�వాన�ని ఎంపతి తగ�గించాలా వద�దా."
+msgstr "గోప�యతా కారణాల దృష�ట�యా స�థానమ� యొక�క ఖచ�చితత�వాన�ని ఎంపతి తగ�గించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ఎంపతి పరిచయమ� యొక�క అవతారమ�న� చాట� విండో ప�రతీక వలె ఉపయోగించాలా లేదా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "వెబ� ఇన�‌స�పెక�టర� వంటి వెబ�‌కిట� డెవలపర� సాధనమ�ల� చేతనమ� చేయవలెనా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"స�వయంచాలకంగా అనన�సంధానించ�టక�/మళ�ళీ అన�సంధానించ�టక� అన�సంధాన నిర�వాహకాలన� "
-"ఉపయోగించాలా వద�దా."
+"స�వయంచాలకంగా అనన�సంధానించ�టక�/మళ�ళీ అన�సంధానించ�టక� అన�సంధాన నిర�వాహకాలన� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
-msgstr ""
-"మీర� పరిశీలించాలన�క�న�న భాషలక� ప�రవేశపెట�టిన పదమ�లన� పరిశీలించాలా వద�దా."
+msgstr "మీర� పరిశీలించాలన�క�న�న భాషలక� ప�రవేశపెట�టిన పదమ�లన� పరిశీలించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "సంభాషణలలో చిర�నవ�వ�లన� గ�రాఫికల� బొమ�మలలోనికి మార�చాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "నాడీధ�వన�లన� క�రియాశీల పర�చ�టక�, అతి ధ�వన�ల నిర�పయోగ పర�చ� ఫిల�టర�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"నెట�‌వర�క�లో ప�రవేశించినప�డ� పరిచయమ�లక� సూచించ�టక� శబ�దమ� వినిపించాలా వద�దా."
+msgstr "నెట�‌వర�క�లో ప�రవేశించినప�డ� పరిచయమ�లక� సూచించ�టక� శబ�దమ� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"నెట�‌వర�క� న�ండి నిష�క�రమించినప�డ� పరిచయమ�లక� శబ�ధమ�న� వినిపించాలా వద�దా."
+msgstr "నెట�‌వర�క� న�ండి నిష�క�రమించినప�డ� పరిచయమ�లక� శబ�ధమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "ఘటనలన� తెలియజేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "లోనికివచ�చ� సందేశమ�లన� తెలియజేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "కొత�త సంభాషణలన� తెలియచేయ�టక� శబ�ధమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "బయటక�వెళ�ళ� సందేశమ�లన� తెలియచేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "నెట�‌వర�క�నంద� ప�రవేశించినప�డ� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "నెట�‌వర�క� న�ండి నిష�క�రమించ�నప�డ� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "దూరంగావ�న�నప�ప�డ� లేదా తీరికలేనప�డ� శబ�ద ప�రకటనలన� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ఒక పరిచయం ఆఫ�‌లైన�‌క� వెళ�ళినప�ప�డ� పైకివచ�చ� ప�రకటనన� చూపాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ఒక పరిచయం ఆన�‌లైన�‌క� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటన చూపాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"ఒకవేళ చాట� ఇదివరకే తెరిచివ�ండి, దృష�టి సారించకపోతే, ఒక కొత�త సందేశమ� "
-"వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనన� "
+"ఒకవేళ చాట� ఇదివరకే తెరిచివ�ండి, దృష�టి సారించకపోతే, ఒక కొత�త సందేశమ� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనన� "
 "చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ఒక కొత�త సందేశమ� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనని చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "పరిచయ జాబితానంద� ఖాతా సమత�ల�యతన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"చాట� విండోల� మరియ� పరిచయ జాబితాలలో పరిచయమ�ల కోసం అవతారమ�లన� చూపించాలా వద�దా."
+msgstr "చాట� విండోల� మరియ� పరిచయ జాబితాలలో పరిచయమ�ల కోసం అవతారమ�లన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "పరిచయ జాబితా నంద� ఆఫ�‌లైన�లో ఉన�న పరిచయాలన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "దూరంగా లేదా తీరికలేనప�డ� పైకివచ�చ� ప�రకటనలన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "పరిచయ జాబితాలో పరిచయమ�ల కొరక� ప�రోటోకాల�స�న� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "చాట� గద�లలో పరిచయ జాబితాన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "పరిచయ జాబితాన� కాంపాక�ట� విధమ�లో చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr ""
-"ప�రధాన విండోన� శీర�షిక పట�టీనంద� 'x' బటన�‌తో మూసివేయ�నప�డ� సందేశప� డైలాగ� "
-"చూపించాలా వద�దా."
+msgstr "ప�రధాన విండోన� శీర�షిక పట�టీనంద� 'x' బటన�‌తో మూసివేయ�నప�డ� సందేశప� డైలాగ� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "చాట� గద�ల కొరక� థీమ�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"పరిచయ జాబితాన� క�రమబద�దీకరిస�త�న�నప�ప�డ� � విధానాన�ని ఉపయోగించాలి. పరిచయాల "
-"పేర�న� \"name\" విల�వతో "
-"ఉపయోగించి క�రమబద�దీకరించ�ట అప�రమేయం. విల�వ \"state\" అన�నది పరిచయ జాబితాన� "
-"స�థితిని బట�టి "
+"పరిచయ జాబితాన� క�రమబద�దీకరిస�త�న�నప�ప�డ� � విధానాన�ని ఉపయోగించాలి. పరిచయాల పేర�న� \"name\" విల�వతో "
+"ఉపయోగించి క�రమబద�దీకరించ�ట అప�రమేయం. విల�వ \"state\" అన�నది పరిచయ జాబితాన� స�థితిని బట�టి "
 "క�రమబద�దీకరిస�త�ంది."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
@@ -486,35 +495,31 @@ msgstr "సందేశకమ� మరియ� VoIP ఖాతాల�"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ఫైల� బదిలీ పూర�తయినది, కాని ఫైల� పాడైనది"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ఫైల� బదిలీ దూరస�థ పరిచయం ద�వారా సహకరించబడ�టలేద�"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "ఎంచ�క�న�న ఫైల� సాధారణ ఫైల� కాద�"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "ఎంచ�క�న�న ఫైల� ఖాళీది"
 
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:346
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy/empathy-message.c:419
 msgid "Called %s"
-msgstr "%sతో కాల� చేయి"
+msgstr "%s పిలవబడినది"
 
-#: ../libempathy/empathy-message.c:349
-#, fuzzy, c-format
-#| msgid "Missed call from %s"
+#: ../libempathy/empathy-message.c:422
 msgid "Call from %s"
-msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
+msgstr "%s న�పిల�వ�మ�"
 
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
@@ -544,162 +549,161 @@ msgstr "ఫైలà±�à°¨à±� బదిలీచేయà±�à°Ÿà°•à±� à°ªà±�రయతà
 msgid "The other participant is unable to transfer the file"
 msgstr "పాల�గొన�న ఇతర�ల� ఫైల� బదిలీచేయలేకపోత�న�నార�"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "తెలియని కారణం"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "అంద�బాట�లోవ�న�నాన�"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "తీరికలేద�"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "దూరంగా ఉన�నాన�"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "అదృశ�యమ�గా ఉన�నాన�"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "ఆఫ�‌లైన�లో ఉన�నాన�"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "� కారణమ� తెల�పలేద�"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "స�థితి ఆఫ�‌లైన�‌క� అమర�చబడింది."
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "నెట�‌వర�క� దోషమ�"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "ప�రామాణీకరణ విఫలమైంది"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ఎన�‌క�రిప�షన� దోషమ�"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "పేర� వాడ�కలో ఉంది"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "ధృవీకరణపత�రం సమకూర�చబడలేద�"
 
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "ధృవీకరణపత�రం నమ�మలేనిది"
 
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "ధృవీకరణపత�రం గడ�వ� మ�గిసినది"
 
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "ధృవీకరణపత�రాన�ని ఉత�తేజపరచలేద�"
 
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "ధృవీకరణపత�ర అతిథ�యపేర�తో సరిపోలడంలేద�"
 
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "ధృవీకరణపత�రం వేలిమ�ద�ర సరిపోలడంలేద�"
 
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "ధృవీకరణపత�రం స�వంతగా-సంతకం చేసినది"
 
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "ధృవీకరణపత�ర దోషమ�"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "ఎన�‌క�రిప�షన� అంద�బాట�లో లేద�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "ధృవీకరణపత�రం చెల�లనిది"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "అన�సంధానమ� తిరస�కరించబడింది"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "అన�సంధానమ�న� స�థాపించలేకపోయింది"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "అన�సంధానమ�న� కోల�పోయింది"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "ఈ వనర� ఇంతక�మ�ందే సేవకానికి అన�సంధానించబడింది"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr ""
-"అన�సంధానమ� అదే వనర�ని ఉపయోగించ�క�ని ఒక కొత�త అన�సంధానమ�చే ప�నఃస�థాపించబడింది"
+msgstr "అన�సంధానమ� అదే వనర�ని ఉపయోగించ�క�ని ఒక కొత�త అన�సంధానమ�చే ప�నఃస�థాపించబడింది"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "సేవకమ�లో ఈ ఖాతా ఇదివరకే ఉన�నది"
 
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "అన�సంధానమ�న� నిర�వహించ�టక� సేవకానికి ప�రస�త�తమ� తీరికలేద�"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "దృవీకరణపత�రం తొలగించబడింది"
 
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"స�రక�షితమ�కాని సైఫర� అల�గారిథమ� లేదా క�రిప�టోగ�రాఫికల�లీ బలహీనమైన "
-"ధృవీకరణపత�రాన�ని వాడ�త�ంది"
+msgstr "స�రక�షితమ�కాని సైఫర� అల�గారిథమ� లేదా క�రిప�టోగ�రాఫికల�లీ బలహీనమైన ధృవీకరణపత�రాన�ని వాడ�త�ంది"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"సర�వర� సర�టిఫికెట�, లేదా సర�వర� సర�టిఫికేట� శ�రేణి లోతైన యొక�క పొడవ�, గూఢ లైబ�రరీ ద�వారా విధించబడిన పరిమిత�లన� "
+"దాటక�ండా"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "దగ�గరలోని వ�యక�త�ల�"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "యాహూ! జపాన�"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "గూగ�ల� టాక�"
 
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "ఫేస�‌బ�క� చాట�"
 
@@ -749,72 +753,79 @@ msgstr[1] "%d నెలల క�రితం"
 msgid "in the future"
 msgstr "భవిష�యత�త�లో"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
-msgstr "ఖాతాల�"
+msgstr "ఖాతాల� అన�నియ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "సేవకమ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "పోర�ట�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s అనే ఖాతా నా వెబ� ఖాతాల ద�వారా సవరించబడింది."
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "నా వెబ� ఖాతాల�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1209
+msgid "The account %s is edited via %s."
+msgstr "%s అనే ఖాతా,%s ద�వారా సవరించబడింది."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s ఖాతాన� ఎంపతిలో సవరించ�ట వీల�కాద�."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "నా వెబ� ఖాతాలన� ప�రారంభించ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+msgid "Edit %s"
+msgstr "సవరణ "
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "వాడ�కరి పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "అన�వర�తించ� (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "ప�రవేశించ� (_J)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "సేవకమ�లో ఈ ఖాతా ఇంతక�మ�ందే ఉన�నది"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "ఈ సేవకమ� పై ఒక కొత�త ఖాతాన� సృష�టించ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "రద�ద�చేయి (_n)"
 
@@ -823,19 +834,19 @@ msgstr "రద�ద�చేయి (_n)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s పై %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "కొత�త ఖాతా"
 
@@ -847,6 +858,7 @@ msgstr "<b>ఉదాహరణ:</b> నా తెరపేర�"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -956,76 +968,84 @@ msgstr "మీ ICQ UIN �మిటి?"
 msgid "What is your ICQ password?"
 msgstr "మీ ICQ సంకేతపదమ� �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "స�వయం"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "నమోద�చేస�కొన�"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "�చ�ఛికాల�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "�దీకాద�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "అక�షర సమితి:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"చాలా IRC సర�వర�ల� మీర� భావిస�త�న�నారా కాద� మీర� కన�క, ఒక పాస�వర�డ�న� ఎంటర� చేయకండి, పాస�వర�డ� అవసరం "
+"లేద�."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "నెట� వర�క�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "నెట�‌వర�క�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "మార�పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "సంకేతపదం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "నిష�క�రమణ సందేశం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "అసల� పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "సేవకాల�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "మీ IRC మార�పేర� �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "� IRC నెట�‌వర�క�?"
 
@@ -1067,8 +1087,7 @@ msgid ""
 msgstr ""
 "ఇది మీ వాడ�కరిపేర�, మీ సాధారణ ఫేస�‌బ�క� ప�రవేశం కాద�.\n"
 "ఒకవేళ మీర� facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"మీక� ఒకవేళ ఒక ఫేస�‌బ�క� వాడ�కరిపేర� లేక�ంటే <a href=\"http://www.facebook."
-"com/username/"
+"మీక� ఒకవేళ ఒక ఫేస�‌బ�క� వాడ�కరిపేర� లేక�ంటే <a href=\"http://www.facebook.com/username/"
 "\">ఈ పేజీని</a> వాడి ఒకటి సృష�టించండి."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
@@ -1133,7 +1152,7 @@ msgstr "మొదటి పేర� (_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "జబ�బర� �డి (_J):"
+msgstr "జాబ�బర� �డి (_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1169,23 +1188,23 @@ msgstr "విరామం (సెకన�లలో)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
-msgstr ""
+msgstr "ఇచ�ఛాపూర�వకాలన� అలాగే వ�ంచండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
-msgstr ""
+msgstr "దారిమళ�ళింప�న� వదిలివేయండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
-msgstr ""
+msgstr "యాంత�రిక తత�వం:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
-msgstr ""
+msgstr "బహ�విధాలైన ఇచ�ఛాపూర�వకాల�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
-msgstr ""
+msgstr "NAT ట�రావెర�సల� �చ�ఛికాల�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
@@ -1209,14 +1228,18 @@ msgid "Transport:"
 msgstr "ట�రాన�స��పోర�ట�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "లండ�లింస� మరియ� మొబైల� ఫోన�ల� కాల� ఈ ఖాతాన� ఉపయోగించండి"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "మీ SIP ఖాతా సంకేతపదం �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "మీ SIP ప�రవేశ �డి �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "వాడ�కరిపేర� (_U):"
 
@@ -1240,36 +1263,37 @@ msgstr "యాహూ! �డి (_D):"
 msgid "_Room List locale:"
 msgstr "గది జాబితా స�థానికం (_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "బొమ�మన� మార�చలేకపోయింది"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "మీ వ�యవస�థ నంద� ఆమోదించిన � బొమ�మ ఫార�మేట�ల� సహకరించ�టలేద�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf న�ండి png కి భద�రపర�చవద�ద�"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "దస�రం లొని చిత�రాన�ని  భద�రపర�చ వద�ద�  "
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "మీ అవతారమ� బొమ�మన� ఎంచ�కోండి"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ఒక చిత�రాన�ని తీయండి..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "బొమ�మ లేద�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "బొమ�మల�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "అన�ని ఫైళ�ళ�"
 
@@ -1277,104 +1301,101 @@ msgstr "అన�ని ఫైళ�ళ�"
 msgid "Click to enlarge"
 msgstr "పెద�దదిచేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 #| msgid "There was an error while creating the account."
 msgid "There was an error starting the call"
-msgstr "ఖాతాన� సృష�టించ�నప�ప�డ� అక�కడ ఒక దోషమ� వ�ంది."
+msgstr "కాల� ప�రారంభమ�లో ఒక దోషం ఉంది"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "పేర�కొన�న సంప�రదించండి కాల�స� మద�దత� ఇవ�వద�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:53
 #| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "ఎంచ�క�న�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
+msgstr "పేర�కొన�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:55
 #| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "ఎంచ�క�న�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
+msgstr "పేర�కొన�న సంప�రదించండి చెల�ల�బాట�లో లేద�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:57
 #| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "ఈ సంభాషణ పై విషయమ� సహకరించ�ట లేద�"
+msgstr " అత�యవసర కాల�స� ఈ నియమావళి మద�దత� లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "రహస�య చాట�‌ని తెర�చ�టలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "ఈ సంభాషణ పై విషయమ� సహకరించ�ట లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "విషయమ�న� మార�చ�టక� మీర� అన�మతించబడర�"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� అనేది చెల�లని పరిచయప� �డి"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ప�రస�త�త సంభాషణలోని అన�ని సందేశాలన� త�డిచివేయి"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ప�రస�త�త సంభాషణ యొక�క విషయమ�న� అమర�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ఒక కొత�త చాట� గదిలో చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ఒక కొత�త చాట� గదిలో చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>]: ప�రస�త�తప� దానితో అప�రమేయమ�గా చాట� గదిని "
-"వదిలివెళ�ళ�"
+"/part [<chat room ID>] [<reason>]: ప�రస�త�తప� దానితో అప�రమేయమ�గా చాట� గదిని వదిలివెళ�ళ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ఒక గోప�య చాట�‌ని తెర�వ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ఒక గోప�య చాట�‌ని తెర�వ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ప�రస�త�త సేవకమ�లో మీ మార�పేర�ని మార�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <message>:ప�రస�త�త సంభాషణక� ఒక ACTION సందేశాన�ని పంపేంద�క�"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
+"/say <message> : ప�రస�త�త సంభాషణక� <message> పంపండి. ఈ ఒక '/' తో మొదలయ�యే ఒక సందేశాన�ని "
+"పంపడానికి ఉపయోగిస�తార�. ఉదాహరణక�: \"/ చేరడానికి / చెప�పే ఒక కొత�త చాట� రూమ� చేరడానికి ఉపయోగిస�తార�\""
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/ WHOIS <contact ID>: ఒక పరిచయాన�ని గ�రించి ప�రదర�శన సమాచారం"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1382,113 +1403,113 @@ msgstr ""
 "/help [<command>]: సహకారమ� ఉన�న అన�ని ఆదేశాలన� చూపిస�త�ంది. ఒకవేళ <command> "
 "నిర�వచించబడినట�టయితే, దాని వాడ�కని చూపించ�."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "వాడ�క: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "తెలియని ఆదేశమ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "తెలియని ఆదేశమ�; అంద�బాట�లోవ�న�న ఆదేశమ�ల కోసం /help చూడండి"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "సందేశం పంప�టక� కావలసిన బ�యాలెన�స� లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
-msgstr ""
+msgstr "సామర�ధ�యాన�ని కలిగి లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "ఆఫ�‌లైన�"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "చెల�లని పరిచయం"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "అన�మతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "మరీ పొడవైన సందేశమ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "అమల�పర�చబడలేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "తెలియద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' సందేశం పంప�టలో దోషమ�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "సందేశం పంపడంలో దోషమ�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "విషయం:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "విషయం దీనికి అమర�చబడింది: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "� విషయం నిర�వచించిలేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(� సూచనల� లేవ�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s'ని నిఘంట�వ�కి చేర�చ�"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s'ని %s నిఘంట�వ�కి చేర�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "చిర�నవ�వ�న� చేర�చ�"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "పంప� (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "అక�షరక�రమం సూచనల� (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "ఇటీవలి చిట�టాలన� పొంద�టలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s అనన�సంధానించార�"
@@ -1496,12 +1517,12 @@ msgstr "%s అనన�సంధానించార�"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s అన�నది %2$s చేత బయటక� తోసివేయబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s తోసివేయబడ�డార�"
@@ -1509,17 +1530,17 @@ msgstr "%s తోసివేయబడ�డార�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s అన�వార� %2$s చేత నిషేధించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s నిషేధించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s గదిని వదిలివెళ�ళార�"
@@ -1529,117 +1550,133 @@ msgstr "%s గదిని వదిలివెళ�ళార�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s గదిలో చేరార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ఇప�ప�డ� %s వలె అయినార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "అనన�సంధానించబడ�డార�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "ఈ సంకేతపదమ�న� భద�రపరచాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "గ�ర�తించ�కొన�"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "ఇప�ప�డ� కాద�"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "మరలా ప�రయత�నించ�"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "సంకేతపదం తప�ప�; దయచేసి మళ�ళీ ప�రయత�నించండి:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "ఈ గది సంకేతపదమ�తో రక�షణ కలిగివ�ంది:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "అన�సంధానించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "సంభాషణ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "తెలియని లేదా చెల�లని గ�ర�తింపకం"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "పరిచయాన�ని నిరోధించ�ట తాత�కాలికంగా అంద�బాట�లోలేద�"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "పరిచయాన�ని నిరోధించ�ట అంద�బాట�లోలేద�"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "అన�మతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "పరిచయాన�ని నిరోధించలేకపోత�ంది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాలన� సవరించ�"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "ఖాతా:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "నిరోధించబడిన సంపర�కాల�"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "తీసివేయి "
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "లింక� చిర�నామాన� నకల�తీయ� (_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "లింక�న� తెర�వ� (_O)"
 
@@ -1670,18 +1707,18 @@ msgid "Block %s?"
 msgstr "%s నిరోధించాలా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "మీర� మళ�ళీ మీర� సంప�రదించడం న�ండి '% s' బ�లాక� ఖచ�చితంగా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ఈ పరిచయమ� ద�ర�వినియోగాన�ని నివేదించ� (_R)"
@@ -1701,44 +1738,44 @@ msgstr "వాడ�కరిని నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
-msgstr ""
+msgstr "గ�ంప�లో లేని"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
 msgstr "ఇష�టమైన వ�యక�త�ల� (_F)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "మీర� నిజంగా '%s' గ�ంప�న� తీసివేయాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "గ�ంప�న� తీసివేస�త�న�నది"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "తీసివేయి (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "మీర� నిజంగానే '%s' పరిచయాన�ని తీసివేయాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "పరిచయాన�ని తీసివేస�త�న�నది"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "పరిచయాన�ని జతచేయి...(_A)"
 
@@ -1747,48 +1784,48 @@ msgid "_Block Contact"
 msgstr "పరిచయాన�ని నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "చాట� (_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ఆడియో కాల� (_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "వీడియో కాల� (_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "మ�న�పటి సంభాషణల� (_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ఫైల�న� పంప�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "నా డెస�క��టాప�‌న� పంచ�కొన�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "ఇష�టాంశమ�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "సమాచారమ� (_m)"
 
@@ -1798,33 +1835,41 @@ msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "మిమ�మల�ని ఈ గదికి ఆహ�వానిస�త�న�నార�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "చాట� గదికి ఆహ�వానించ� (_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "పరిచయాలన� వెత�క�"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "వెత�క�: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "పరిచయాన�ని జతచేయి...(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "� పరిచయాల� కనపడలేద�"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "మీ సందేశం మిమ�మల�ని  పరిచయం చెస�త�ంది:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "మీర� ఆన�లైన� ఉన�నప�ప�డ� నన�న� చూడండి తెలియచేయండి. ధన�యవాదాల�!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "ఒక పరిచయాన�ని ఎంచ�కొన�"
@@ -1877,153 +1922,153 @@ msgstr "దూరంగా ఉన�నప�డ� సందేశమ�:"
 msgid "Channels:"
 msgstr "ఛానళ�ళ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "దేశమ� ISO కోడ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "దేశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "రాష�ట�రమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "పట�టణమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "ప�రాంతమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "పోస�టల� కోడ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "వీధి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "భవనమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "అంతస�థ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "గది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "పాఠ�యమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "వివరణ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "ఖచ�చితత�వ స�థాయి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "దోషమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "నిల�వ� దోషమ� (మీటర�ల�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "అడ�డ దోషమ� (మీటర�ల�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "వేగమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "బేరింగ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "ఎక�క� వేగమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "చివరిగా నవీకరించబడింది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "రేఖాంశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "అక�షాంశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "ఎత�త�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "స�థానమ�"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "అవతారాన�ని భద�రపర�చ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "అవతారాన�ని భద�రపరచలేకపోత�ంది"
 
@@ -2033,7 +2078,7 @@ msgstr "<b>స�థానమ�</b> ఈ (తేది)వద�ద\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "అలియాస�:"
 
@@ -2053,7 +2098,7 @@ msgstr "పరిచయమ� వివరాల�"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "గ�ర�తించ�నది:"
 
@@ -2079,8 +2124,7 @@ msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"గ�ంప�లో కనిపించాలన�క�ంట�న�న పరిచయాన�ని ఎంచ�కోండి.  మీర� ఒకటి కన�నా ఎక�క�వ "
-"గ�ంప�లన� "
+"గ�ంప�లో కనిపించాలన�క�ంట�న�న పరిచయాన�ని ఎంచ�కోండి.  మీర� ఒకటి కన�నా ఎక�క�వ గ�ంప�లన� "
 "ఎంచ�కొనవచ�చ� లేదా అస�సల� ఎంచ�కొనపోవచ�చ�నని గమనించండి."
 
 #: ../libempathy-gtk/empathy-groups-widget.c:364
@@ -2093,17 +2137,17 @@ msgid "Select"
 msgstr "ఎంచ�కోండి"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "గ�ంప�"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "కిందపేర�కొన�న గ�ర�తింప� నిరోధించబడ�న�:"
 msgstr[1] "కిందపేర�కొన�న గ�ర�తింప�ల� నిరోధించబడ�న�:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "కిందపేర�కొన�న గ�ర�తింప� నిరోధించబడద�:"
@@ -2129,41 +2173,69 @@ msgstr "జాబితాలో ఎడమవైపà±� à°Žà°‚à°šà±�కోబడà
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "కాల� స�థానానికి ఉపయోగించడానికి ఖాతా ఎంచ�కోండి"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "కాల�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "Provide"
+msgid "Mobile"
+msgstr "మొబైల�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "పని "
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "ఇల�ల� "
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "పరిచయాలన� లింక�చేయి...(_O)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "తొలగించ� మరియ� నిరోధించ� (_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
+"మీర� నిజంగా లింక� పరిచయం '% s' తొలగించడానికి అన�క�ంట�న�నారా? ఈ లింక� సంప�రదించండి న� తయార�చేసే అన�ని "
+"పరిచయాలన� తొలగిస�త�ంది గమనించండి."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2218,7 +2290,7 @@ msgstr "అన�‌లింక� చేయి...(_U)"
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgstr "పూర�తిగా ప�రత�యేక పరిచయాలన� లోకి ప�రదర�శించబడే లింక� పరిచయాలన� విడిపోయార�."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2238,219 +2310,217 @@ msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
+"మీర� ఈ లింక� పరిచయాలన� లింక� తొలగించడానికి నిశ�చయించ�క�న�నారా? ఈ పూర�తిగా ప�రత�యేక పరిచయాలన� లోకి లింక� "
+"పరిచయాలన� స�ప�లిట� ఉంట�ంది."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "అన�‌లింక� చేయి (_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "చరిత�ర"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
-msgstr ""
+msgstr "చూపించ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:527
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "వెత�క�"
 
-#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1159
+msgid "Chat in %s"
+msgstr "%sతో  చాట�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+msgid "Chat with %s"
+msgstr "% S తో చాట�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 #| msgid "%A %B %d %Y"
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-log-window.c:747
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Chat with %s"
-msgstr "%sతో కాల� చేయి"
+msgstr "%A %B %d %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
-msgstr ""
+msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
-msgstr ""
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s రెండవ "
+msgstr[1] "%d సెకన�ల క�రితం"
 
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:1389
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%d నిమ�షమ�"
+msgstr[1] "%d నిమ�షాల�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr ""
+msgstr "కాల�,% s పట�టింది% s వద�ద మ�గిసింది"
 
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
-msgstr ""
+msgstr "నేడ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1217
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
-msgstr "వెస�ట�రన�"
+msgstr "నిన�న"
 
-#: ../libempathy-gtk/empathy-log-window.c:1233
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "%A %B %d %Y"
+msgstr "%A %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
-msgstr ""
+msgstr "� సమయమ�లోనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 #| msgid "None"
 msgid "Anyone"
-msgstr "�దీకాద�"
+msgstr "ఎవరైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
-msgstr ""
+msgstr "ఎవర�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
-msgstr ""
+msgstr "ఎప�డ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
-msgstr ""
+msgstr "�దైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:2274
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3007
 #| msgid "Set status"
 msgid "Text chats"
-msgstr "స�థితిని అమర�చ�"
+msgstr "పాఠ�య చాట�ల�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2276
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
 #| msgid "Call"
 msgid "Calls"
-msgstr "కాల�"
+msgstr "కాల�స� "
 
-#: ../libempathy-gtk/empathy-log-window.c:2281
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3014
 #| msgid "Incoming call"
 msgid "Incoming calls"
-msgstr "లోనికివచ�చ� కాల�"
+msgstr "లోనికివచ�చ� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2282
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3015
 #| msgid "Outgoing voice call"
 msgid "Outgoing calls"
-msgstr "బయటక� వెళ�ళ� వాయిస� కాల�"
+msgstr "బయటక� వెళ�ళ� వాయిస� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2283
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3016
 #| msgid "Missed call from %s"
 msgid "Missed calls"
-msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
+msgstr "మిస�స�డ� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2304
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3038
 #| msgid "Chat"
 msgid "What"
-msgstr "చాట�"
+msgstr "�మిటి"
 
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "మీర� మ�న�పటి సంభాషణల� అన�ని లాగ�లన� తొలగించడానికి నిశ�చయించ�క�న�నారా?"
 
-#: ../libempathy-gtk/empathy-log-window.c:2921
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3751
 #| msgid "C_lear"
 msgid "Clear All"
-msgstr "శ�భ�రపరచ� (_l)"
+msgstr "అన�న శ�భ�రపరచ� "
 
-#: ../libempathy-gtk/empathy-log-window.c:2928
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3758
 #| msgid "Connected from:"
 msgid "Delete from:"
-msgstr "దీని న�ండి అన�సంధానించబడింది:"
+msgstr "దీని న�ండి తొలగ�మిచ�:"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "కాల�"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\"> లోడ� అవ�తోంది ...</ span>మ�త"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "చాట�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "History"
-msgstr ""
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#, fuzzy
+msgid "Delete All History..."
+msgstr "చరిత�ర అన�న  తొలగించ� ."
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 #| msgid "Provide"
 msgid "Profile"
-msgstr "సమకూర�చ�"
+msgstr "ప�రొఫైల�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "వీడియో"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
 #| msgid "File"
 msgid "_File"
-msgstr "ఫైల�"
+msgstr "ఫైల� (_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
-msgstr ""
+msgstr "పేజీ 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "పరిచయమ� �డి:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "చాట� (_h)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "కొత�త సంభాషణ"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "వీడియోన� పంప� (_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "కాల� (_a)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "కొత�త కాల�"
 
@@ -2469,34 +2539,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "అన�రూపిత సందేశమ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "అన�రూపిత సందేశాలన� సవరించ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "ఈ స�థితిని ఇష�టాంశమ� న�ండి తీసివేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "ఈ స�థితిని ఇష�టాంశమ�గా చేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "స�థితిని అమర�చ�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "మీ ఉనికిని మరియ� ప�రస�త�త స�థితిని అమర�చండి"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "అన�రూపిత సందేశాల�..."
 
@@ -2510,24 +2580,27 @@ msgid "New %s account"
 msgstr "కొత�త %s ఖాతా"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "తర�వాతది కన�గొన�"
+msgid "Find:"
+msgstr "కన�గొన�:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "మ�న�పటిది కన�గొన�"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "సరిపోల� సందర�భం (_c)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "కన�గొన�:"
+msgid "Phrase not found"
+msgstr "పదబందం కనపడలేద�"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "సరిపోల� సందర�భం"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "తర�వాత (_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "పదబందం కనపడలేద�"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "మ�న�పటి (_P)"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2569,45 +2642,39 @@ msgstr "బయటక� వెళ�ళ� వాయిస� కాల�"
 msgid "Voice call ended"
 msgstr "వాయిల� కాల� మ�గిసినది"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "అన�రూపిత సందేశమ�న� ప�రవేశపెట�ట�"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "అన�రూపిత సందేశాలన� సవరించ�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "కొత�త స�థితి సందేశాన�ని భద�రపర�చ� (_N)"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "భద�రపర�చబడిన స�థితి సందేశాల�"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "సందేశం% s వద�ద సవరించబడింది"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "సాధారణ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "శాస�త�రీయ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "సరళమైన"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "శ�భ�రమ�చేయి"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "నీలం"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "చాట� సర�వర� అందించిన గ�ర�తింప� ధ�ర�వీకరించబడద�."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
@@ -2666,8 +2733,7 @@ msgstr "కొనసాగ�"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
-"అన�సంధానమ� నమ�మదగినది కాద�. �ది �మైనప�పటికీ మీర� కొనసాగాలన�క�ంట�న�నారా?"
+msgstr "అన�సంధానమ� నమ�మదగినది కాద�. �ది �మైనప�పటికీ మీర� కొనసాగాలన�క�ంట�న�నారా?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
@@ -2677,29 +2743,28 @@ msgstr "మ�న�మ�ంద� అన�సంధానాలక� ఈ ఎ
 msgid "Certificate Details"
 msgstr "ధృవీకరణపత�రం వివరాల�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI తెర�వలేకపోత�ంది"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "ఒక ఫైల�‌ని ఎంచ�కొన�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "ఫైల�న� భద�రపర�చ�టక� తగిన ఖాళీ స�థలమ� లేద�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"ఈ ఫైల�న� భద�రపర�చ�టక� %s ఖాళీ స�థలమ� అవసరమ�, కాని కేవలం %s మాత�రమే అంద�బాట�లో "
-"ఉన�నది. దయచేసి "
+"ఈ ఫైల�న� భద�రపర�చ�టక� %s ఖాళీ స�థలమ� అవసరమ�, కాని కేవలం %s మాత�రమే అంద�బాట�లో ఉన�నది. దయచేసి "
 "వేరొక స�థానమ�న� ఎన�న�కోండి."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s న�ండి ఫైల� లోనికివస�త�న�నది"
@@ -2887,23 +2952,23 @@ msgstr "� దోష సందేశమ� లేద�"
 msgid "Instant Message (Empathy)"
 msgstr "సత�వర సందేశం (ఎంపతి)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "వ�యవస�థ ప�రారంభమ�లో అన�సంధానించవద�ద�"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "వ�యవస�థ ప�రారంభమయినప�డ� పరిచయ జాబితా గాని లేక � ఇతర డైలాగ�లన� చూపవద�ద�"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- ఎంపతి IM క�లయింట�"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "ఖాతా నిర�వాహకాన�ని సంప�రదించ�టలో దోషమ�"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2911,6 +2976,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"టెలెపథ�య�  ఖాతా మేనేజర� కనెక�ట� చేసేటప�ప�డ� ఒక లోపం ఉంది. లోపం జరిగినది:\n"
+"\n"
+"% s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2919,10 +2987,8 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"ఎంపతి అనేది ఒక ఉచిత సాఫ�ట��వేర�; దీనిని మీర� ఫ�రీ సాఫ�ట��వేర� ఫౌండేషన� "
-"ప�రచ�రించిన విధంగా గ�నూ జనరల� పబ�లిక� "
-"లైసెన�స�  నిబంధనలక� అన�గ�ణంగా పంచవచ�చ� మరియ�/లేదా సవరించవచ�చ�; వెర�షన� 2 "
-"లైసెన�స�, లేదా (మీ �చ�చికాన�ని "
+"ఎంపతి అనేది ఒక ఉచిత సాఫ�ట��వేర�; దీనిని మీర� ఫ�రీ సాఫ�ట��వేర� ఫౌండేషన� ప�రచ�రించిన విధంగా గ�నూ జనరల� పబ�లిక� "
+"లైసెన�స�  నిబంధనలక� అన�గ�ణంగా పంచవచ�చ� మరియ�/లేదా సవరించవచ�చ�; వెర�షన� 2 లైసెన�స�, లేదా (మీ �చ�చికాన�ని "
 "బట�టి) �దైనా తర�వాత వెర�షన�."
 
 #: ../src/empathy-about-dialog.c:85
@@ -2932,10 +2998,8 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ఎంపతి అనేది � విధమైన పూచికత�త�ల� లేక�ండా ఉపయోగపడ�త�ందనే నమ�మకంతో పంచబడ�త�ంది; "
-"వ�యాపారానికి గాని లేదా "
-"ఒక ఖచ�చితమైన ప�రయోజనానికి ఉపయోగించవచ�చని కనీసం భావించిన పూచికత�త�ల� కూడా "
-"లేక�ండా ఇవ�వబడ�త�ంది.  "
+"ఎంపతి అనేది � విధమైన పూచికత�త�ల� లేక�ండా ఉపయోగపడ�త�ందనే నమ�మకంతో పంచబడ�త�ంది; వ�యాపారానికి గాని లేదా "
+"ఒక ఖచ�చితమైన ప�రయోజనానికి ఉపయోగించవచ�చని కనీసం భావించిన పూచికత�త�ల� కూడా లేక�ండా ఇవ�వబడ�త�ంది.  "
 "మరిన�ని వివరాలక� గ�నూ జనరల� పబ�లిక� లైసెన�స� చూడండి."
 
 #: ../src/empathy-about-dialog.c:89
@@ -2944,14 +3008,13 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"మీర� ఎంపతితో పాట�గా గ�నూ జనరల� పబ�లిక� లైసెన�స� యొక�క నకల� పొందివ�ండాలి; "
-"ఒకవేళ పొందకపోతే, Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301 USA కి వ�రాయండి"
+"మీర� ఎంపతితో పాట�గా గ�నూ జనరల� పబ�లిక� లైసెన�స� యొక�క నకల� పొందివ�ండాలి; ఒకవేళ పొందకపోతే, Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301 USA కి వ�రాయండి"
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME కొరక� సత�వర సందేశక క�లయింట�"
+msgstr "గ�నోమ� కొరక� సత�వర సందేశక క�లయింట�"
 
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
@@ -2985,8 +3048,7 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"మీర� మీ ఖాతాల సమాచారమ�న� ప�రవేశపెట�ట�టక� మరలా వెనక�క�వెళ�ళి ప�రయత�నించవచ�చ� "
-"లేదా ఈ సహాయకాన�ని నిష�క�రమించి "
+"మీర� మీ ఖాతాల సమాచారమ�న� ప�రవేశపెట�ట�టక� మరలా వెనక�క�వెళ�ళి ప�రయత�నించవచ�చ� లేదా ఈ సహాయకాన�ని నిష�క�రమించి "
 "మరియ� సవరణ మెనూ న�ండి మీ ఖాతాలన� తర�వాత జతచేయండి."
 
 #: ../src/empathy-account-assistant.c:220
@@ -3025,10 +3087,8 @@ msgid ""
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"ఎంపతితో మీర� ఆన�‌లైన�లో ఉన�న వ�యక�త�లతో మాట�లాడవచ�చ�న� మరియ� గూగ�ల� టాక�, "
-"AIM, విండోస� లైవ� వంటి ఇతర "
-"చాట� ప�రోగ�రామ�ల� ఉపయోగించే తోటివారితో మరియ� స�నేహిత�లతో చాట� చేయవచ�చ�. "
-"మైక�రోఫోన� లేదా వెబ�‌కామ�‌తో మీర� ఆడియో లేదా "
+"ఎంపతితో మీర� ఆన�‌లైన�లో ఉన�న వ�యక�త�లతో మాట�లాడవచ�చ�న� మరియ� గూగ�ల� టాక�, AIM, విండోస� లైవ� వంటి ఇతర "
+"చాట� ప�రోగ�రామ�ల� ఉపయోగించే తోటివారితో మరియ� స�నేహిత�లతో చాట� చేయవచ�చ�. మైక�రోఫోన� లేదా వెబ�‌కామ�‌తో మీర� ఆడియో లేదా "
 "వీడియో కాల�స�న� కూడా చేయవచ�చ�."
 
 #: ../src/empathy-account-assistant.c:629
@@ -3049,8 +3109,7 @@ msgstr "లేద�, నాక� ఒక కొత�త ఖాతా కావ
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"లేద�, ఇప�ప�డ� కేవలం దగ�గరలోని ఆన�‌లైన�‌లోవ�న�న వ�యక�త�లన� చూడాలన�క�ంట�న�నాన�"
+msgstr "లేద�, ఇప�ప�డ� కేవలం దగ�గరలోని ఆన�‌లైన�‌లోవ�న�న వ�యక�త�లన� చూడాలన�క�ంట�న�నాన�"
 
 #: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
@@ -3073,6 +3132,9 @@ msgid ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
+"తాదాత�మ�యం స�వయంచాలకంగా కన�గొనడంలో మరియ� మీర� అదే నెట�వర�క� పై కనెక�ట� ప�రజల� చాట� చెయ�యవచ�చ�. న� "
+"ఉపయోగించడానికి మీర� భావించినా, క�రింద వివరాలన� సరైనవని తనిఖీ చెయ�యండి. మీర� స�లభంగా 'అకౌంట�స�' డైలాగ� "
+"ఉపయోగించి ఈ ఫీచర� తర�వాత ఈ వివరాల� మార�ప� లేదా సాధ�యం చేస�కోవచ�చ�"
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
@@ -3090,6 +3152,9 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
+"మీర� telepathy-salut ఇన�స�టాల� కాద� అని, మీ స�థానిక నెట�వర�క� అన�సంధానం ప�రజల� చాట� చేయలేర�. మీర� "
+"ఈ లక�షణాలన� సాధ�యం భావించినా, telepathy-salut ప�యాకేజీ ఇన�స�టాల� దయచేసి మరియ� అకౌంట�స� డైలాగ� న�ండి ఒక "
+"పీప�ల� సమీపంలో ఖాతాని సృష�టించ�కోండి"
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -3125,7 +3190,8 @@ msgid "Your new account has not been saved yet."
 msgstr "మీ కొత�త ఖాతా ఇంకా భద�రపర�చబడలేద�."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "అన�సంధానిస�త�న�నది..."
 
@@ -3194,10 +3260,9 @@ msgstr ""
 "మీర� కొనసాగాలన�క�ంట�న�నారా?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
 #| msgid "_Add…"
 msgid "Add…"
-msgstr "జతచేయి...(_A)"
+msgstr "జతచేయి..."
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
@@ -3211,19 +3276,12 @@ msgstr "à°� à°ªà±�రోటోకాలà±� à°¸à±�థాపించబడిలà
 msgid "Protocol:"
 msgstr "ప�రోటోకాల�:"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
-#| msgid "_Remove"
-msgid "Remove"
-msgstr "తీసివేయి (_R)"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"కొత�త ఖాతాన� జతచేయ�టక�, మీర� ఉపయోగించాలన�క�ంట�న�న ప�రతీ ప�రొటోకాల�‌క� మొదట "
-"బ�యాకెండ�‌న� స�థాపించాలి."
+"కొత�త ఖాతాన� జతచేయ�టక�, మీర� ఉపయోగించాలన�క�ంట�న�న ప�రతీ ప�రొటోకాల�‌క� మొదట బ�యాకెండ�‌న� స�థాపించాలి."
 
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
@@ -3241,338 +3299,369 @@ msgstr "ఎంపతి à°ªà±�రామాణీకరణ à°•à±�లయింటà
 msgid "People nearby"
 msgstr "దగ�గరలోని ప�రజల�"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- ఎంపతి ఆడియో/వీడియో క�లయింట�"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "ఎంపతి ఆడియో/వీడియో క�లయింట�"
 
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "భేదమ�"
 
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "ప�రకాశమ�"
 
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "గామా"
 
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ధ�వనిస�థాయి"
 
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "పక�క పట�టీ(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "ఆడియో ఇన�‌ప�ట�"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "వీడియో ఇన�‌ప�ట�"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "డయల�‌ప�యాడ�"
 
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "వివరాల�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "%sతో కాల� చేయి"
 
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "యంత�రమ�తో చూడబడిన IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "అంతర�జాలంతో ఒక సేవకమ�తో చూడబడిన IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "ఇతర వైప� కనిపించే పీర� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "రిలే సేవకమ� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "బహ�ళప�రసార గ�ంప� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "అన�సంధానించబడింది — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "సాంకేతిక వివరాల�"
 
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
-"మీ కంప�యూటర�చే సహకరించబడ�త�న�న � ఆడియో ఫార�మేట�లన� %s సాఫ�ట�‌వేర� "
-"అర�థంచేస�కోలేకపోత�న�నది"
+msgstr "మీ కంప�యూటర�చే సహకరించబడ�త�న�న � ఆడియో ఫార�మేట�లన� %s సాఫ�ట�‌వేర� అర�థంచేస�కోలేకపోత�న�నది"
 
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "% s యొక�క సాఫ�ట�వేర� మీ కంప�యూటర� మద�దత� వీడియో ఫార�మాట�లలో అర�థం లేద�"
 
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
-"%s కి అన�సంధానమ�న� స�థాపించలేకపోత�న�నది. మీలో ఒకర� నేర�గా అన�సంధానమగ�టక� "
-"అన�మతించని నెట�‌వర�క� పై "
+"%s కి అన�సంధానమ�న� స�థాపించలేకపోత�న�నది. మీలో ఒకర� నేర�గా అన�సంధానమగ�టక� అన�మతించని నెట�‌వర�క� పై "
 "ఉండి వ�ండవచ�చ�న�."
 
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "నెట�‌వర�క� నంద� వైఫల�యమ� ఉన�నది"
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల�‌కి అవసరమైన ఆడియో ఫార�మేట�ల� మీ కంప�యూటర�‌లో స�థాపించబడిలేవ�"
 
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల�‌కి అవసరమైన వీడియో ఫార�మేట�ల� మీ కంప�యూటర�‌లో స�థాపించబడిలేవ�"
 
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
+"ఊహించని �దో ఒక Telepathy భాగం లో జరిగింది. దయచేసి <a href=\"%s\"> ఈ బగ� నివేదిక </ a> మరియ� "
+"సహాయం మెన� లో 'డీబగ�' విండో న�ండి సేకరించిన లాగ�లన� అటాచ�."
 
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "కాల� ఇంజన�లో ఒక వైఫల�యమ� ఉన�నది"
 
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "ప�రవాహమ� చివరక� చేర�క�న�నది"
 
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "ఆడియో ప�రవాహాన�ని స�థాపించలేకపోత�ంది"
 
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "వీడియో ప�రవాహాన�ని స�థాపించలేకపోత�ంది"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "ఆడియో"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "పరిచయానికి మళ�ళీ కాల� చేయి"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "కెమెరా ఆప�"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "డీకోడింగ� కొడెక�:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "కెమెరా ఆన� చేయి"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "కెమెరా నిలిపివేయి"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "డీకోడింగ� కొడెక�:"
+msgid "Display the dialpad"
+msgstr "డీల�పడ�  ప�రదర�శన"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "కెమెరాన� అచేతనపర�చ� మరియ� వీడియోని పంప�ట ఆపివేయి"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "ఎన�కోడింగ� కొడెక�:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "కెమెరాన� చేతనపరిచి, వీడియోన� పంప�"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "హాంగ� చేయి"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "కెమెరాన� చేతనపర�చ� కాని వీడియో పంపవద�ద�"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "ప�రస�త�త కాల�‌ని హాంగ� చేయి"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ఎన�కోడింగ� కొడెక�:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "స�థానిక అభ�యర�ధి:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "హాంగ� చేయి"
+msgid "Maximise me"
+msgstr "నన�న� గరిష�టీకరించ�"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ప�రస�త�త కాల�‌ని హాంగ� చేయి"
+msgid "Minimise me"
+msgstr "నన�న� కనిష�టీకరించ�"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "స�థానిక అభ�యర�ధి:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "దూరస�థ అభ�యర�ధి:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "మ�న�జూప�"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "ఆడియోన� పంప�"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "తిరిగిడయిల�‌చేయి"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "వీడియోన� పంప� "
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "దూరస�థ అభ�యర�ధి:"
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "చ�ప� డీల�ప"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ఆడియోన� పంప�"
+msgid "Start a video call"
+msgstr "ఒక వీడియో కాల� ప�రారంభండ�"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr ""
+msgid "Start an audio call"
+msgstr "ఒక ఆడియో కాల� ప�రారంభం"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824
-#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826
-#: ../src/empathy-call-window.c:1827
-msgid "Unknown"
-msgstr "తెలియద�"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "మార�పిడి కెమెరా"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "వీడియో (_i)"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "నొక�కండి ఆడియో ప�రసార"
 
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "వీడియో ఆప�"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "నొక�కండి వీడియో ప�రసార"
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "వీడియో ఆన�‌చేయి"
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "తెలియద�"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "వీడియో మ�న�జూప�"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "వీడియో కాల� "
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "కాల� (_C)"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "డయల�‌ప�యాడ�"
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "కెమెరా (_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "విషయసూచిక (_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "డీబగ� (_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "సహాయం (_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "మైక�రోఫోన� (_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+#| msgid "Geoclue Settings"
+msgid "_Settings"
+msgstr "అమరికల� (_S)"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "వీక�షణం (_V)"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d చద�వనిది)"
 msgstr[1] "%s (%d చద�వనివి)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (మరియ� %u ఇతర)"
 msgstr[1] "%s (మరియ� %u ఇతరాల�)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ఇతర�ల న�ండి చదవనివి)"
 msgstr[1] "%s (%d ఇతర�ల న�ండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d అన�నిటిని న�ండి చదవనివి)"
 msgstr[1] "%s (%d అన�నిటిని న�ండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d సందేశమ�న� పంప�త�న�నది"
 msgstr[1] "%d సందేశాలన� పంప�త�న�నది"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "ఒక సందేశమ�న� టైప� చేస�త�న�నార�."
 
@@ -3604,10 +3693,6 @@ msgstr "à°Ÿà±�యాబà±�‌నà±� à°•à±�డివైపà±�à°•à±� à°•à°¦à±�à°ªà
 msgid "Notify for All Messages"
 msgstr "అన�ని సందేశాలకూ తెలియజేయి"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "విషయసూచిక (_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "సంభాషణ (_C)"
@@ -3620,10 +3705,6 @@ msgstr "ట�యాబ�‌న� వేర�చేయి (_D)"
 msgid "_Favorite Chat Room"
 msgstr "ఇష�టమైన చాట� గది (_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "సహాయం (_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "తర�వాత ట�యాబ� (_N)"
@@ -3644,15 +3725,15 @@ msgstr "ట�యాబ�‌ల� (_T)"
 msgid "_Undo Close Tab"
 msgstr "ట�యాబ�‌ని మూసివేయ�ట రద�ద�చేయి (_U)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "పేర�"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "గది"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "స�వయం-అన�సంధానం"
 
@@ -3660,95 +3741,96 @@ msgstr "స�వయం-అన�సంధానం"
 msgid "Manage Favorite Rooms"
 msgstr "ఇష�టమైన గద�లన� నిర�వహించ�"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "లోనికివచ�చ� వీడియో కాల�"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "లోనికివచ�చ� కాల�"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s మీక� వీడియో కాల� చేస�త�న�నార�, మీర� సమాధానమివ�వాలన�క�ంట�న�నారా?"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s మీక� కాల� చేస�త�న�నార�. మీర� సమాధానమివ�వాలన�క�ంట�న�నారా?"
 
-#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751
-#: ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s న�ండి లోనికి కాల� వస�త�న�నది"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "తిరస�కరించ� (_R)"
 
-#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "సమాధానంయివ�వ� (_A)"
 
-#: ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
-msgstr ""
+msgstr "వీడియోతో జవాబ�వ�వండి (_A)"
 
-#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s న�ండి వీడియో కాల� వస�త�న�నది"
 
-#: ../src/empathy-event-manager.c:857
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "గది ఆహ�వానమ�"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s లో చేర�టక� ఆహ�వానం"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s మిమ�మలన� %sక� జేర�టక� ఆహ�వానిస�త�న�నార�"
 
-#: ../src/empathy-event-manager.c:874
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "తిరస�కరించ�(_D)"
 
-#: ../src/empathy-event-manager.c:879
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "చేర� (_J)"
 
-#: ../src/empathy-event-manager.c:906
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s మిమ�మ�లన� %sనంద� జేర�టక� ఆహ�వానించార�"
 
-#: ../src/empathy-event-manager.c:912
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s లో చేర�టక� మీర� ఆహ�వానించబడ�డార�"
 
-#: ../src/empathy-event-manager.c:963
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s న�ండి వచ�చ�చ�న�న ఫైల� బదిలీకరణ"
 
-#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "సంకేతపదం అవసరం"
 
-#: ../src/empathy-event-manager.c:1211
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "లో ఉన�నప�ప�డ�% s చూడండి అన�మతి కావాలన�క�ంట�న�నారని"
 
-#: ../src/empathy-event-manager.c:1215
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3848,6 +3930,10 @@ msgstr "\"%s\" యొక�క ఇంటిగ�రిటిని పరిశ
 msgid "Hashing \"%s\""
 msgstr "\"%s\" హాషింగ�"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "ఫైల�"
@@ -3869,8 +3955,7 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"దిగ�మతి చేయ�టక� � ఖాతాల� కన�గొనలేకపోయింది. ఎంపతి ప�రస�త�తం ఖాతాలన� పిడ�జిన� "
-"న�ండి దిగ�మతి చేయ�టక� "
+"దిగ�మతి చేయ�టక� � ఖాతాల� కన�గొనలేకపోయింది. ఎంపతి ప�రస�త�తం ఖాతాలన� పిడ�జిన� న�ండి దిగ�మతి చేయ�టక� "
 "మాత�రమే సహకరిస�త�ంది."
 
 #: ../src/empathy-import-dialog.c:199
@@ -3926,111 +4011,104 @@ msgid "Top up account credit"
 msgstr "టాప� అప� ఖాతా క�రెడిట�"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "టాప� అప�..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "చిర�నామా"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "పరిచయమ�ల జాబితా"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "ఖాతాలన� చూపించ� మరియ� సవరించ�"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "పటమ� పై పరిచయాల� (_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "క�రెడిట� బ�యాలెన�స�"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "పరిచయమ�ల జాబితాలో వెత�క� (_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ఇష�టాంశాలలో చేర� (_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ఇష�టాంశాలన� నిర�వహించ�"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "సాధారణ పరిమాణమ� (_o)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "కొత�త కాల�...(_C)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "అవతారమ�లతో సాధారణ పరిమాణమ� (_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ప�రాధాన�యతల� (_r)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "ప�రోటోకాల�స�న� చూపించ� (_r)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "పేర�ని బట�టి క�రమబద�దీకరించ� (_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "స�థితిని బట�టి క�రమబద�దీకరించ� (_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ఖాతాల� (_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాల� (_O)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "పరిమాణమ�న� క�దించ� (_C)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "డీబగ� (_D)"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ఫైల� బదిలీల� (_F)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "చేర�...(_J)"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "కొత�త సంభాషణ...(_N)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "ఆఫ�‌లైన� పరిచయాల� (_O)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "వ�యక�తిగత సమాచారమ� (_P)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "గది (_R)"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "పరిచయాల కోసం వెత�క�...(_S)"
 
@@ -4077,17 +4155,14 @@ msgstr "గది జాబితాన� లోడ� చేయలేకపో
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"ఇక�కడ చేర�టక� గది పేర�న� ప�రవేశపెట�టండి లేదా జాబితాలోని ఒకటి లేదా ఎక�క�వ గద�ల "
-"పై నొక�కండి."
+msgstr "ఇక�కడ చేర�టక� గది పేర�న� ప�రవేశపెట�టండి లేదా జాబితాలోని ఒకటి లేదా ఎక�క�వ గద�ల పై నొక�కండి."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"గదికి ఆతిధ�యమిచ�చ� సేవకమ�న� ప�రవేశపెట�టండి, లేదా ఒకవేళ గది ప�రస�త�త ఖాతా "
-"సేవకమ�లో ఉంటే ఖాళీగా వదిలివేయండి"
+"గదికి ఆతిధ�యమిచ�చ� సేవకమ�న� ప�రవేశపెట�టండి, లేదా ఒకవేళ గది ప�రస�త�త ఖాతా సేవకమ�లో ఉంటే ఖాళీగా వదిలివేయండి"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -4101,79 +4176,79 @@ msgstr "గది జాబితా"
 msgid "_Room:"
 msgstr "గది (_R):"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "సందేశం స�వీకరించబడింది"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "సందేశం పంపబడింది"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "కొత�త సంభాషణ"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "పరిచయం ఆన�‌లైన�‌క� వెళ�త�ంది"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "పరిచయం ఆఫ�‌లైన�క� వెళ�త�ంది"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "ఖాతా అన�సంధానించబడింది"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "ఖాతా అనన�సంధానించబడింది"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "భాష"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "జూలియట�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "రోమియో"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ఓ రోమియో, రోమియో, ఎక�కడ�న�నావ� రోమియో?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "నీ తండ�రి తిరస�కరించ� మరియ� నీ పేర� తిరస�కరించవచ�చ�;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "లేదా నీవ� విల�ట� లేకపోతే, కానీ నా ప�రేమ ప�రమాణ స�వీకారం"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "నేన� ఇకపై ఒక Capulet ఉంటాం."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "నేనింకా ఎక�క�వ వినాలా, లేక నేన� ఇక మాట�లాడవచ�చా?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "జూలియట� అనన�సంధానించింది"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ప�రాధాన�యతల�"
 
@@ -4181,144 +4256,159 @@ msgstr "ప�రాధాన�యతల�"
 msgid "Appearance"
 msgstr "కనిపించ�విధమ�"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "ప�రవర�తన"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "చాట� థీమ� (_e):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "దూరంగా లేదాతీరికలేనప�ప�డ� ప�రకటనలన� అచేతనపర�చ� (_a)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "దూరంగా లేదా తీరికలేనప�ప�డ� శబ�దమ�లన� అచేతనపర�చ� (_a)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "లోనికివచ�చ� ఘటనలన� ప�రకటిత ప�రాంతమ�లో చూపించ�"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ప�రతిధ�వని రద�ద� ఇతర వ�యక�తి మీ వాయిస� ధ�వని స�వచ�చమైన చేయడానికి సహాయపడ�త�ంది, కానీ కొన�ని కంప�యూటర�లలో "
+"సమస�యల� కారణం కావచ�చ�. మీర� లేదా ఇతర వ�యక�తి కాల�స� సమయంలో వింత ధ�వన�లన� లేదా గ�లిట�చెస� వినడానికి ఉంటే, "
+"ప�రతిధ�వని రద�ద� ఆఫ� చెయ�యడానికి మరియ� కాల� మళ�ళీ ప�రారంభించడానికి ప�రయత�నించండి."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "పరిచయమ� ఆన�‌లైన�క� వచ�చినప�ప�డ� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "పరిచయం ఆఫ�‌లైన�‌క� వెళ�ళినప�ప�డ� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "చాట� పై దృష�టిసారించనప�ప�డ� ప�రకటనలన� చేతనపర�చ� (_c)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "ఈ భాషలక� అక�షరక�రమ తనిఖీచేయ�టని చేతనపర�చ�:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "సాధారణ"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "ఇన�ప�ట� స�థాయి:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "ఇన�ప�ట� పరిమాణం:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "స�థాన మూలాల�:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "సంభాషణల చిట�టా"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "ప�రకటనల�"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ఘటనల కొరక� శబ�దమ�న� ప�లేచేయి"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "గోప�యత"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ�ట వలన మీ పట�టణమ�, రాష�ట�రమ� మరియ� దేశమ� కంటే "
-"ఎక�క�వ స�పష�టమ�గా "
+"స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ�ట వలన మీ పట�టణమ�, రాష�ట�రమ� మరియ� దేశమ� కంటే ఎక�క�వ స�పష�టమ�గా "
 "ప�రచ�రించబడవ�.  GPS నిర�దేశకాల� ఖచ�చితమ�గా 1 డెసిమల� స�థానమ�నక� ఉంటాయి."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "చిర�నవ�వ�లన� బొమ�మల వలె చూపించ� (_s)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "గద�లలో పరిచయ జాబితాన� చూపించ� (_l)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "శబ�దమ�ల�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "అక�షరక�రమ తనిఖీ"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"మీర� � భాషలకైతే ఒక నిఘంట�వ�ని స�థాపించారో ఆ భాషల యొక�క జాబితా మాత�రమే "
-"ప�రతిబింబిస�త�ంది."
+msgstr "మీర� � భాషలకైతే ఒక నిఘంట�వ�ని స�థాపించారో ఆ భాషల యొక�క జాబితా మాత�రమే ప�రతిబింబిస�త�ంది."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "థీమ�ల�"
 
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:30
 #| msgid "Theme Variant:"
 msgid "Variant:"
-msgstr "థీమ� రూపాంతరం:"
+msgstr "రూపాంతరం:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "వ�యవస�థ ప�రారంభమయినప�డ� స�వయంచాలకంగా అన�సంధానమవ�వ� (_A)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "సెల�‌ఫోన� (_C)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "బ�డగ ప�రకటనలన� చేతనపర�చ� (_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "శబ�దప� ప�రకటనలన� చేతనపర�చ� (_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "నెట�‌వర�క� (IP, Wi-Fi) (_N)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "వేర�వేర� విండోలలో కొత�త చాట�‌లన� తెర�వ� (_O)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "స�థానమ�న� నా పరిచయమ�లక� ప�రచ�రించ� (_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ� (_R)"
 
@@ -4330,91 +4420,136 @@ msgstr "స�థితి"
 msgid "_Quit"
 msgstr "నిష�క�రమించ� (_Q)"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "పరిచయానికి మళ�ళీ కాల� చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "కెమెరా ఆప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "కెమెరా ఆన� చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "కెమెరాన� అచేతనపర�చ� మరియ� వీడియోని పంప�ట ఆపివేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "కెమెరాన� చేతనపరిచి, వీడియోన� పంప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "కెమెరాన� చేతనపర�చ� కాని వీడియో పంపవద�ద�"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "మ�న�జూప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "తిరిగిడయిల�‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "వీడియో (_i)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "వీడియో ఆప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "వీడియో ఆన�‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "వీడియో మ�న�జూప�"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "పరిచయ పటమ� వీక�షణ"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "భద�రపరచ�"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "దోషశ�ద�ది విండో"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "నిలిపివేయి"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "స�థాయి "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "దోషశ�ద�ది"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "సమాచారమ�"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "సందేశమ�"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "క�లిష�టమైన"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "దోషమ�"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "సమయం"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "డొమైన�"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "వర�గమ�"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "స�థాయి"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
-"ఎంచ�క�న�న అన�సంధాన నిర�వాహకమ� దూరస�థ దోషశ�ద�ధిచేసే పొడిగింప�క� సహకరించ�టలేద�."
+msgstr "ఎంచ�క�న�న అన�సంధాన నిర�వాహకమ� దూరస�థ దోషశ�ద�ధిచేసే పొడిగింప�క� సహకరించ�టలేద�."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "భాగస�వామిని ఆహ�వానించ�"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "సంభాషణలోకి ఆహ�వానించ�టక� ఒక పరిచయాన�ని ఎన�న�కోండి:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "ఆహ�వానించ�"
 
 #: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"� డైలాగ�లన� ప�రదర�శించవద�ద�; �దైనా పనిచేయి (ఉదా. దిగ�మతిచేయ�ట) మరియ� "
-"నిష�క�రమించ�"
+msgstr "� డైలాగ�లన� ప�రదర�శించవద�ద�; �దైనా పనిచేయి (ఉదా. దిగ�మతిచేయ�ట) మరియ� నిష�క�రమించ�"
 
 #: ../src/empathy-accounts.c:187
 msgid ""
@@ -4423,8 +4558,7 @@ msgstr "కేవలం \"దగà±�గరలోని à°µà±�యకà±�à°¤à±�à°²à±
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"ప�రాథమికంగా ఇచ�చిన ఖాతాన� ఎంచ�కొన� (ఉదా, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ప�రాథమికంగా ఇచ�చిన ఖాతాన� ఎంచ�కొన� (ఉదా, gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4438,7 +4572,16 @@ msgstr "- ఎంపతి ఖాతాల�"
 msgid "Empathy Accounts"
 msgstr "ఎంపతి ఖాతాల�"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "ఒక నిర�దిష�ట సేవ చూపించ�"
+
+#: ../src/empathy-debugger.c:75
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- తాదాత�మ�యం డీబగ�గర�"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "ఎంపతి దోష శ�ద�దిచేసేది"
 
@@ -4451,17 +4594,19 @@ msgid "Respond"
 msgstr "స�పందించ�"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "తిరస�కరించ�"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "సమాధానమివ�వ�"
 
 #: ../src/empathy-notifications-approver.c:227
 msgid "Answer with video"
-msgstr ""
+msgstr "వీడియో తో సమాధానం"
 
 #: ../src/empathy-notifications-approver.c:235
 #: ../src/empathy-notifications-approver.c:245
@@ -4473,37 +4618,76 @@ msgstr "నిరాకరించ�"
 msgid "Accept"
 msgstr "అంగీకరించ�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "సమకూర�చ�"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s ఇప�ప�డే కాల� చేయడానికి ప�రయత�నించార�, కాని మీర� వేరే కాల� నంద� ఉన�నార�."
+msgstr "%s ఇప�ప�డే కాల� చేయడానికి ప�రయత�నించార�, కాని మీర� వేరే కాల� నంద� ఉన�నార�."
 
-#: ../src/empathy-call-window.c:1246
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Call with %d participants"
-msgstr "%sతో కాల� చేయి"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr " నెన�"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "లొ దచ�"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "నిశబ�దం"
+
+#: ../src/empathy-call-window.c:2780
+#| msgid "Location"
+msgid "Duration"
+msgstr "నిడివి"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:2783
+#, c-format
 #| msgid "Connected — %d:%02dm"
 msgid "%s — %d:%02dm"
-msgstr "అన�సంధానించబడింది — %d:%02dm"
-
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr ""
+msgstr "%s — %d:%02dm"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "సరిపోల� సందర�భం (_M)"
 
+#~ msgid "Find Next"
+#~ msgstr "తర�వాతది కన�గొన�"
+
+#~ msgid "Find Previous"
+#~ msgstr "మ�న�పటిది కన�గొన�"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "అన�రూపిత సందేశమ�న� ప�రవేశపెట�ట�"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "కొత�త స�థితి సందేశాన�ని భద�రపర�చ� (_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "భద�రపర�చబడిన స�థితి సందేశాల�"
+
+#, fuzzy
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "డయల�‌ప�యాడ�"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ఖాతాలన� చూపించ� మరియ� సవరించ�"
+
+#, fuzzy
+#~| msgid "Call with %s"
+#~ msgid "Call with %d participants"
+#~ msgstr "%sతో కాల� చేయి"
+
 #~ msgid "All"
 #~ msgstr "అన�ని"
 
@@ -4693,9 +4877,6 @@ msgstr "సరిపోల� సందర�భం (_M)"
 #~ msgid "Allow _network usage"
 #~ msgstr "నెట�వర�క� వినియోగమ�న� అన�మతించ�మ� (_n)"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue అమరికల�"
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "సేవ %s కొరక� అన�వర�తనమ�న� ప�రారంభించలేద�: %s"
 
diff --git a/po/ug.po b/po/ug.po
index 9ddc48eb0..1a7e9ba4d 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,10 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-11 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-21 15:03+0000\n"
+"PO-Revision-Date: 2012-02-18 16:10+0900\n"
 "Last-Translator: Gheyret Kenji<gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,1234 +19,1252 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Google Talk، Facebook، MSN ۋە باشقا سۆھبەت مۇلازىمەتلىرىنى ئىشلىتىپ "
-"پاراڭلىشىش"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "ئالاقە ك�لىشىمى"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy ئىنت�رن�ت مۇڭداشقۇسى"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "ئالاقە ك�لىشىمى"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Google Talk، Facebook، MSN ۋە باشقا سۆھبەت مۇلازىمەتلىرىنى ئىشلىتىپ پاراڭلىشىش"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "مۇڭداشقۇ ۋە VoIP ھ�ساباتلىرى"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "مۇڭداشقۇ ۋە VoIP ھ�ساباتلىرىنى باشقۇرۇش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "ي�ڭى سۆھبەت ئۈچۈن داۋاملىق ي�ڭى كۆزنەك ئىچىش"
+msgid "Connection managers should be used"
+msgstr "باغلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى ك�رەك"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"گۇرۇپپا سۆھبىتىدە لەقىمىنى تاماملاش(tab) تا ئىشلىتىدىغان، لەقەمنىڭ ئاخىرىغا "
-"قوشۇلىدىغان ھەرپ."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "باغلىنىش باشقۇرغۇچىسى ئاپتوماتىك ئۈزۈلۈش/قايتا باغلىنىشنى باشقۇرامدۇ يوق"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "سۆھبەت كۆزنەك ئۆرنىكى"
+msgid "Empathy should auto-connect on startup"
+msgstr "قوزغالغان ھامان Empathy ئاپتوماتىك باغلانسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Chat window theme variant"
-msgstr "سۆھبەت كۆزنەك ئۆرنىكىنىڭ شالغۇت"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "قوزغالغاندا ھ�ساباتقا ئاپتوماتىك كىرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"ئىملا تەكشۈرۈشتە ئىشلىتىدىغان تىللارنىڭ تىزىمى(پەس بىلەن ئايرىلغان، \"en, "
-"fr, nl\" د�گەندەك)"
+msgid "Empathy should auto-away when idle"
+msgstr "بىكار ۋاقتىدا Empathy نىڭ ھالىتى ئاپتوماتىك ھالدا يوققا ئۆزگەرسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Compact contact list"
-msgstr "دوستلار تىزىمى(ئىخچام)"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ئىشلەتكۈچى جىم تۇرسا، ئاپتوماتىك ھالدا ئورنىدا يوق ھالىتىگە كىرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Connection managers should be used"
-msgstr "باغلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى ك�رەك"
+msgid "Empathy default download folder"
+msgstr "تۇتاش كۆڭۈللەرنىڭ ئەسلىدىكى چۈشۈرۈش مۇندەرىجىسى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Contact list sort criterion"
-msgstr "تونۇشلار تىزىمنى تەرتىپلەش ئۆلچىمى"
+msgid "The default folder to save file transfers in."
+msgstr "قوبۇل قىلغان ھۆججەتلەرنى ساقلايدىغان كۆڭۈلدىكى قىسقۇچ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Default directory to select an avatar image from"
-msgstr "باش سۈرەتنى تاللايدىغان كۆڭۈلدىكى مۇندەرىجە"
+msgid "Show offline contacts"
+msgstr "توردا يوق ئالاقەداشلارنىمۇ كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable popup notifications when away"
-msgstr "يوق چاغدا سەكرىمە ئۇقتۇرۇشىنى چىقارمىسۇن"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا  توردا يوق ئالاقەداشلارنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Disable sounds when away"
-msgstr "ئايرىلغاندا ئاۋازنى ئ�تىش"
+msgid "Show avatars"
+msgstr "باش سۈرەتلەرنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Display incoming events in the status area"
-msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "ئالاقەداشلار تىزىمى ۋە سۆھبەت كۆزنىكىدە ئالاقەداشلارنىڭ باش سۈرىتىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت. ئەگەر تاللانمىسا(false بولسا)، "
-"ئىشلەتكۈچىگە شۇ ھامان كۆرسىتىدۇ."
+msgid "Show protocols"
+msgstr "ك�لىشىمنامىلەرنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can publish the user's location"
-msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئ�لان قىلالايدۇ"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا ئالاقەداشلارنىڭ ك�لىشىمىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the GPS to guess the location"
-msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە GPS نى ئىشلەتكىلى بولىدۇ"
+msgid "Show Balance in contact list"
+msgstr "ئالاقەداش تىزىمىدا Balance نى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە يان�ون تورىنى ئىشلەتكىلى بولىدۇ"
+msgid "Whether to show account balances in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا ھ�سابات  balance لىرىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy can use the network to guess the location"
-msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە تورنى ئىشلەتكىلى بولىدۇ"
+msgid "Compact contact list"
+msgstr "دوستلار تىزىمى(ئىخچام)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy default download folder"
-msgstr "تۇتاش كۆڭۈللەرنىڭ ئەسلىدىكى چۈشۈرۈش مۇندەرىجىسى"
+msgid "Whether to show the contact list in compact mode."
+msgstr "ئالاقەداش تىزىمىنى ئىخچام كۆرۈنۈشتە كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy has migrated butterfly logs"
-msgstr "butterfly خاتىرىلىرىنى يۆتكىدى."
+msgid "Hide main window"
+msgstr "ئاساسى كۆزنەكنى يوشۇر"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-away when idle"
-msgstr "بىكار ۋاقتىدا Empathy نىڭ ھالىتى ئاپتوماتىك ھالدا يوققا ئۆزگەرسۇن"
+msgid "Hide the main window."
+msgstr "بۇ ئاساسى كۆزنەكنى يوشۇر"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should auto-connect on startup"
-msgstr "قوزغالغان ھامان Empathy ئاپتوماتىك باغلانسۇن"
+msgid "Default directory to select an avatar image from"
+msgstr "باش سۈرەتنى تاللايدىغان كۆڭۈلدىكى مۇندەرىجە"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy ئورۇننىڭ ئ�نىقلىقىغا بەك ئ�تىبار بەرمىسىمۇ بولىدۇ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "باش سۈرەت تاللانغان ئەڭ ئاخىرقى قىسقۇچ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"سۆھبەت كۆزنىكىنىڭ سىنبەلگىسىنىڭ ئورنىغا ئالاقەداشنىڭ باش سۈرىتىنى كۆرسەتسۇن"
+msgid "Open new chats in separate windows"
+msgstr "ئايرىم كۆزنەكتە ي�ڭى سۆھبەت باشلايدۇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit ئىجادىيەت قورالىنى قوزغات"
+msgid "Always open a separate chat window for new chats."
+msgstr "ي�ڭى سۆھبەت ئۈچۈن داۋاملىق ي�ڭى كۆزنەك ئىچىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable popup notifications for new messages"
-msgstr "ي�ڭى خەت كەلگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Display incoming events in the status area"
+msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Enable spell checker"
-msgstr "ئىملا تەكشۈرگۈچنى قوزغات"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت. ئەگەر تاللانمىسا(false بولسا)، ئىشلەتكۈچىگە شۇ ھامان كۆرسىتىدۇ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide main window"
-msgstr "ئاساسى كۆزنەكنى يوشۇر"
+msgid "The position for the chat window side pane"
+msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنەكچىسىنىڭ ئورنى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Hide the main window."
-msgstr "بۇ ئاساسى كۆزنەكنى يوشۇر"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنىكىنىڭ ساقلاپ قويۇلغان ئورنى(پىكس�ل)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Nick completed character"
-msgstr "لەقەمنى تاماملاش ھەرپى"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "ئالاقەداش گۇرۇپپىسى كۆرسەتسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Open new chats in separate windows"
-msgstr "ئايرىم كۆزنەكتە ي�ڭى سۆھبەت باشلايدۇ"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use"
-msgstr "ئىشلىتىدىغان Adium ئۇسلۇبى(theme)نىڭ يولى"
+msgid "Contact list sort criterion"
+msgstr "تونۇشلار تىزىمنى تەرتىپلەش ئۆلچىمى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "سۆھبەتتە Adium ئۇسلۇبى ئىشلىتىلگەن بولسا ئۇنىڭ يولى."
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Play a sound for incoming messages"
-msgstr "ئۇچۇر كەلگەندە ئاۋاز چىقارسۇن"
+msgid "Use notification sounds"
+msgstr "ئۇقتۇرۇش ئاۋازلىرىنى ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for new conversations"
-msgstr "ي�ڭى سۆھبەت ئۈچۈن ئاۋاز قوي"
+msgid "Whether to play a sound to notify of events."
+msgstr "ھادىسىلەرنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound for outgoing messages"
-msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋاز چىقارسۇن"
+msgid "Disable sounds when away"
+msgstr "ئايرىلغاندا ئاۋازنى ئ�تىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs in"
-msgstr "ئالاقەداش كىرگەندە ئاۋاز چىقارسۇن"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when a contact logs out"
-msgstr "ئالاقەداش چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
+msgid "Play a sound for incoming messages"
+msgstr "ئۇچۇر كەلگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log in"
-msgstr "كىرگەندە ئاۋاز چىقارسۇن"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ئۇچۇر كەلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound when we log out"
-msgstr "چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
+msgid "Play a sound for outgoing messages"
+msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "سۆھبەت �وكۇسلانمىغاندا سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs in"
-msgstr "ئالاقەداش كىرگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Play a sound for new conversations"
+msgstr "ي�ڭى سۆھبەت ئۈچۈن ئاۋاز قوي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Pop up notifications when a contact logs out"
-msgstr "ئالاقەداش چىقىپ كەتكەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ي�ڭى سۆھبەتنىڭ باشلانغانلىقىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show Balance in contact list"
-msgstr "ئالاقەداش تىزىمىدا Balance نى كۆرسەت"
+msgid "Play a sound when a contact logs in"
+msgstr "ئالاقەداش كىرگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show avatars"
-msgstr "باش سۈرەتلەرنى كۆرسەت"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ئالاقەداشنىڭ تورغا كىرگىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show contact list in rooms"
-msgstr "ئۆيلەردىكى ئالاقەداشلار تىزىمىنى كۆرسەت"
+msgid "Play a sound when a contact logs out"
+msgstr "ئالاقەداش چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show hint about closing the main window"
-msgstr "ئاساسىي كۆزنەكنى ياپىدىغان چاغدا كۆرسەتمە كۆرسىتەمدۇ يوق"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ئالاقەداشنىڭ توردىن چىقىپ كەتكىنىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Show offline contacts"
-msgstr "توردا يوق ئالاقەداشلارنىمۇ كۆرسەت"
+msgid "Play a sound when we log in"
+msgstr "كىرگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Show protocols"
-msgstr "ك�لىشىمنامىلەرنى كۆرسەت"
+msgid "Whether to play a sound when logging into a network."
+msgstr "تورغا كىرگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Spell checking languages"
-msgstr "ئىملا تەكشۈرۈش تىلى"
+msgid "Play a sound when we log out"
+msgstr "چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The default folder to save file transfers in."
-msgstr "قوبۇل قىلغان ھۆججەتلەرنى ساقلايدىغان كۆڭۈلدىكى قىسقۇچ."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "تور چىققاندا ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The last directory that an avatar image was chosen from."
-msgstr "باش سۈرەت تاللانغان ئەڭ ئاخىرقى قىسقۇچ."
+msgid "Enable popup notifications for new messages"
+msgstr "ي�ڭى خەت كەلگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The position for the chat window side pane"
-msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنەكچىسىنىڭ ئورنى"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ي�ڭى ئۇچۇر تاپشۇرۇۋالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنىكىنىڭ ساقلاپ قويۇلغان ئورنى(پىكس�ل)"
+msgid "Disable popup notifications when away"
+msgstr "يوق چاغدا سەكرىمە ئۇقتۇرۇشىنى چىقارمىسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
-"سۆھبەت كۆزنىكىدە ئىشلىتىلىدىغان پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۇسلۇب."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"سۆھبەت كۆزنىكىدىكى پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۆرنەك شالغۇتى."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "سۆھبەت �وكۇسلانمىغاندا سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Use graphical smileys"
-msgstr "رەسىملىك چىراي ئىپادىلىرىنى ئىشلەت"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "سۆھبەت باشلانغان بىراق �وكۇسلانمىغاندا، ئۇچۇر كەلسە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Use notification sounds"
-msgstr "ئۇقتۇرۇش ئاۋازلىرىنى ئىشلەت"
+msgid "Pop up notifications when a contact logs in"
+msgstr "ئالاقەداش كىرگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Use theme for chat rooms"
-msgstr "سۆھبەتخانىلارغا ت�ما(ئۇسلۇب) ئىشلەت"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ئالاقەداش تورغا چىققاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئالاقەداشلارغا ئاشكارىلامدۇ يوق."
+msgid "Pop up notifications when a contact logs out"
+msgstr "ئالاقەداش چىقىپ كەتكەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن GPS ئىشلىتەمدۇ يوق."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ئالاقەداش توردىن يوقالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن يان�ون تورى ئىشلىتەمدۇ يوق."
+msgid "Use graphical smileys"
+msgstr "رەسىملىك چىراي ئىپادىلىرىنى ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن تور ئىشلىتەمدۇ يوق."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "سۆھبەتتە چىراي ئىپادىلىرىنى گرا�ىكقا ئايلاندۇرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "butterfly خاتىرىسىنى يۆتكىدىمۇ يوق."
+msgid "Show contact list in rooms"
+msgstr "ئۆيلەردىكى ئالاقەداشلار تىزىمىنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "قوزغالغاندا ھ�ساباتقا ئاپتوماتىك كىرەمدۇ يوق."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "سۆھبەتخانىدا ئالاقەداش تىزىمىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ئىشلەتكۈچى جىم تۇرسا، ئاپتوماتىك ھالدا ئورنىدا يوق ھالىتىگە كىرەمدۇ يوق."
+msgid "Chat window theme"
+msgstr "سۆھبەت كۆزنەك ئۆرنىكى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"شەخسىي سىرنى ئويلىشىپ Empathy ئورۇننىڭ توغرىلىق دەرىجىسىنى تۆۋەنلىتەمدۇ يوق."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "سۆھبەت كۆزنىكىدە ئىشلىتىلىدىغان پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۇسلۇب."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Empathy ئالاقەداشنىڭ باش سۈرىتىنى سۆھبەت كۆزنىكىنىڭ سىنبەلگىسى قىلىپ "
-"ئىشلىتەمدۇ يوق."
+msgid "Chat window theme variant"
+msgstr "سۆھبەت كۆزنەك ئۆرنىكىنىڭ شالغۇت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Web Inspector غا ئوخشاش WebKit ئىجادىيەت قوراللىرىنى ئىناۋەتلىك قىلامدۇ يوق."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "سۆھبەت كۆزنىكىدىكى پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۆرنەك شالغۇتى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"باغلىنىش باشقۇرغۇچىسى ئاپتوماتىك ئۈزۈلۈش/قايتا باغلىنىشنى باشقۇرامدۇ يوق"
+msgid "Path of the Adium theme to use"
+msgstr "ئىشلىتىدىغان Adium ئۇسلۇبى(theme)نىڭ يولى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "كۆرسىتىلگەن تىلدا كىرگۈزۈلگەن سۆزنى تەكشۈرەمدۇ يوق."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "سۆھبەتتە Adium ئۇسلۇبى ئىشلىتىلگەن بولسا ئۇنىڭ يولى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "سۆھبەتتە چىراي ئىپادىلىرىنى گرا�ىكقا ئايلاندۇرامدۇ يوق."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit ئىجادىيەت قورالىنى قوزغات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ئالاقەداشنىڭ تورغا كىرگىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspector غا ئوخشاش WebKit ئىجادىيەت قوراللىرىنى ئىناۋەتلىك قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ئالاقەداشنىڭ توردىن چىقىپ كەتكىنىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Inform other users when you are typing to them"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of events."
-msgstr "ھادىسىلەرنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ئۇچۇر كەلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Use theme for chat rooms"
+msgstr "سۆھبەتخانىلارغا ت�ما(ئۇسلۇب) ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ي�ڭى سۆھبەتنىڭ باشلانغانلىقىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Whether to use the theme for chat rooms."
+msgstr "بۇ ئۇسلۇب(theme)نى سۆھبەتخانا كۆزنىكىگە ئىشلىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Spell checking languages"
+msgstr "ئىملا تەكشۈرۈش تىلى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound when logging into a network."
-msgstr "تورغا كىرگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "ئىملا تەكشۈرۈشتە ئىشلىتىدىغان تىللارنىڭ تىزىمى(پەس بىلەن ئايرىلغان، \"en, fr, nl\" د�گەندەك)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound when logging out of a network."
-msgstr "تور چىققاندا ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Enable spell checker"
+msgstr "ئىملا تەكشۈرگۈچنى قوزغات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "كۆرسىتىلگەن تىلدا كىرگۈزۈلگەن سۆزنى تەكشۈرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ئالاقەداش توردىن يوقالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid "Nick completed character"
+msgstr "لەقەمنى تاماملاش ھەرپى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ئالاقەداش تورغا چىققاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "گۇرۇپپا سۆھبىتىدە لەقىمىنى تاماملاش(tab) تا ئىشلىتىدىغان، لەقەمنىڭ ئاخىرىغا قوشۇلىدىغان ھەرپ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"سۆھبەت باشلانغان بىراق �وكۇسلانمىغاندا، ئۇچۇر كەلسە سەكرىمە ئۇقتۇرۇش "
-"چىقىرامدۇ يوق."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "سۆھبەت كۆزنىكىنىڭ سىنبەلگىسىنىڭ ئورنىغا ئالاقەداشنىڭ باش سۈرىتىنى كۆرسەتسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ي�ڭى ئۇچۇر تاپشۇرۇۋالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy ئالاقەداشنىڭ باش سۈرىتىنى سۆھبەت كۆزنىكىنىڭ سىنبەلگىسى قىلىپ ئىشلىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show account balances in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا ھ�سابات  balance لىرىنى كۆرسىتەمدۇ يوق."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"ئالاقەداشلار تىزىمى ۋە سۆھبەت كۆزنىكىدە ئالاقەداشلارنىڭ باش سۈرىتىنى "
-"كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا  توردا يوق ئالاقەداشلارنى كۆرسىتەمدۇ يوق."
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "كام�را ئۈسكۈنىسى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "سىنلىق سۆزلىشىشتە ئىشلىتىدىغان كام�را ئۈسكۈنىسى، مەسىلەن /dev/video0. د�گەندەك"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا ئالاقەداشلارنىڭ ك�لىشىمىنى كۆرسىتەمدۇ يوق."
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "كام�را ئورنى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show the contact list in chat rooms."
-msgstr "سۆھبەتخانىدا ئالاقەداش تىزىمىنى كۆرسىتەمدۇ يوق."
+msgid "Position the camera preview should be during a call."
+msgstr "سۆزلىشىۋاتقان چاغدىكى كام�را ئالدىن كۆزىتىش كۆزنىكىنىڭ ئورنى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show the contact list in compact mode."
-msgstr "ئالاقەداش تىزىمىنى ئىخچام كۆرۈنۈشتە كۆرسىتەمدۇ يوق."
+msgid "Echo cancellation support"
+msgstr "ئەكس سادانى ئاجىزلىتىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"ماۋزۇ بالدىقىدىكى «x» توپچىسىنى چ�كىپ ئاساسىي كۆزنەكنى ياپقاندا ئۇچۇر "
-"سۆزلەشكۈسى چىقىرامدۇ يوق."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio نىڭ ئەكس سادانى ئاجىزلىتىش سۈزگۈچىنى ئىناۋەتلىك قىلامدۇ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to use the theme for chat rooms."
-msgstr "بۇ ئۇسلۇب(theme)نى سۆھبەتخانا كۆزنىكىگە ئىشلىتەمدۇ يوق."
+msgid "Show hint about closing the main window"
+msgstr "ئاساسىي كۆزنەكنى ياپىدىغان چاغدا كۆرسەتمە كۆرسىتەمدۇ يوق"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"ئالاقەداشلار تىزىمىدىكى ئالاقەداشلارنى تەرتىپلىگەندە قانداق شەرت ئىشلىتىدۇ. "
-"كۆڭۈلدە «ئاتى» بويىچە تەرتىپلەيدۇ. «ھالىتى» بويىچە تەرتىپلەشكىمۇ بولىدۇ."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "ماۋزۇ بالدىقىدىكى «x» توپچىسىنى چ�كىپ ئاساسىي كۆزنەكنى ياپقاندا ئۇچۇر سۆزلەشكۈسى چىقىرامدۇ يوق."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "مۇڭداشقۇ ۋە VoIP ھ�ساباتلىرىنى باشقۇرۇش"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئ�لان قىلالايدۇ"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
-msgid "Messaging and VoIP Accounts"
-msgstr "مۇڭداشقۇ ۋە VoIP ھ�ساباتلىرى"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئالاقەداشلارغا ئاشكارىلامدۇ يوق."
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
-msgstr "ھۆججەت يوللاش تاماملاندى"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە تورنى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "يىراقتىكى ئىشلەتكۈچى ھۆججەت ئەۋەتىشنى ئىشلىتەلمەيدۇ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن تور ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "تاللانغان ھۆججەت مۇنتىزىم ھۆججەت ئەمەس"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە يان�ون تورىنى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "تاللانغان ھۆججەت قۇرۇق"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن يان�ون تورى ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "%s دىن كەلگەن جاۋابسىز چاقىرىش"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "ئورۇننى ئ�نىقلاش ئۈچۈن Empathy دە GPS نى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-message.c:345
-#, c-format
-msgid "Called %s"
-msgstr "چاقىردى %s"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن GPS ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-message.c:348
-#, c-format
-msgid "Call from %s"
-msgstr "چاقىرىلدى %s"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy ئورۇننىڭ ئ�نىقلىقىغا بەك ئ�تىبار بەرمىسىمۇ بولىدۇ"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "سوك�ت تىپىنى ئىشلەتكىلى بولمايدۇ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "شەخسىي سىرنى ئويلىشىپ Empathy ئورۇننىڭ توغرىلىق دەرىجىسىنى تۆۋەنلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "سەۋەب كۆرسىتىلمىگەن"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "ھالەتنى ئۆزگەرتىش تەلەپ قىلىندى"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "ھۆججەت ئەۋەتىشنى ئەمەلدىن قالدۇرۇۋەتتىڭىز"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "قارشى تەرەپ ھۆججەت ئەۋەتىشنى ئەمەلدىن قالدۇرۇۋەتتى"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "ھۆججەت ئەۋەتمەكچى بولغاندا خاتالىق كۆرۈلدى"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "قارشى تەرەپ ھۆججەتنى ئەۋەتەلمىدى"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "نامەلۇم سەۋەب"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "ھۆججەت يوللاش تاماملاندى"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "يىراقتىكى ئىشلەتكۈچى ھۆججەت ئەۋەتىشنى ئىشلىتەلمەيدۇ"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "تاللانغان ھۆججەت مۇنتىزىم ھۆججەت ئەمەس"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "تاللانغان ھۆججەت قۇرۇق"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s دىن كەلگەن جاۋابسىز چاقىرىش"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "چاقىردى %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "چاقىرىلدى %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "ئىشلىتىلىشچان"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ئالدىراش"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "يوق"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "يوشۇرۇن"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "توردا يوق"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "سەۋەبى كۆرسىتىلمىدى"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "ھالەت توردا يوق قىلىپ بەلگىلەندى"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "تور خاتالىقى"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "دەلىللەش مەغلۇپ بولدى"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "شى�ىرلاش خاتالىقى"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "ئات ئىشلىتىلىۋاتىدۇ"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ئىسپاتنامە تەمىنلەنمىگەن"
 
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "ئىسپاتنامە ئىشەنچسىز"
 
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "ئىسپاتنامىنىڭ ۋاقتى ئوتكەن"
 
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "ئىسپاتنامە ئاكتىپ ئەمەس"
 
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ئىسپاتنامە كومپيۇت�رىنىڭ ئاتى ماسلاشمىدى"
 
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "ئىسپاتنامىنىڭ بارماق ئىزى ماسلاشمىدى"
 
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "ئىسپاتنامىنىڭ ئۆزىنىڭ ئىمزاسى"
 
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "ئىسپاتنامە خاتا"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "شى�ىرلاشنى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "ئىسپاتنامە ئىناۋەتسىز"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "باغلىنىش رەت قىلىندى"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "باغلانغىلى بولمىدى"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "باغلىنىش ئۈزۈلدى"
 
-#: ../libempathy/empathy-utils.c:367
-msgid "This resource is already connected to the server"
-msgstr "بۇ مەنبە ئاللىقاچان مۇلازىم�تىرغا باغلانغان"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "بۇ ھ�سابات ئاللىقاچان مۇلازىم�تىرغا باغلانغان"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ئوخشاش مەنبە ئىشلەتكەن باغلىنىش ئەسلىدىكىنىڭ ئورنىنى ئىگىلىدى"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "مۇلازىم�تىردا بۇ ھ�سابات ئاللىقاچان بار"
 
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "مۇلازىم�تىر بەكلا ئالدىراش بولغاچقا بۇ باغلىنىشنى بىر تەرەپ قىلالمايدۇ"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ئىسپاتنامە ئىناۋەتسىز قىلىنغان"
 
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"ئىسپاتنامە خەتەرلىك شى�ىرلاش ئالگورىزىم ئىشلەتكەن ياكى شى�ىرلىنىشى ئاجىز"
+msgstr "ئىسپاتنامە خەتەرلىك شى�ىرلاش ئالگورىزىم ئىشلەتكەن ياكى شى�ىرلىنىشى ئاجىز"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"مۇلازىم�تىر ئىسپاتنامىسىنىڭ ئۇزۇنلۇقى ياكى مۇلازىم�تىر ئىسپاتنامىسىنىڭ "
-"زەنجىرىنىڭ چوڭقۇرلۇقى شى�ىرلاش �ۇنكسىيە ئامبىرىدا بەلگىلەنگەن ئۇزۇنلۇقتىن "
-"ئ�شىپ كەتتى"
+msgstr "مۇلازىم�تىر ئىسپاتنامىسىنىڭ ئۇزۇنلۇقى ياكى مۇلازىم�تىر ئىسپاتنامىسىنىڭ زەنجىرىنىڭ چوڭقۇرلۇقى شى�ىرلاش �ۇنكسىيە ئامبىرىدا بەلگىلەنگەن ئۇزۇنلۇقتىن ئ�شىپ كەتتى"
 
-#: ../libempathy/empathy-utils.c:544
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "يۇمشاق د�تالىڭىز بەك كونا ئىكەن"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "ئىچكى خاتالىق"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "قوشنىلار"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google سۆھبەت"
 
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook سۆھبەت"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "%d س�كۇنت بۇرۇن"
+msgstr[0] "%d س�كۇنت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d مىنۇت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d سائەت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d ھەپتە ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ئاي بۇرۇن"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "كەلگۈسىدە"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "بارلىق ھ�ساباتلار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "ھ�سابات"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ئىم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "مۇلازىم�تىر"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ئ�غىز"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "ھ�سابات %s نى تور ھ�ساباتىم ئارقىلىق تەھرىرلىگىلى بولمىدى."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1160
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "ھ�سابات %s نى Empathy دە تەھرىرلىگىلى بولمىدى."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1180
-msgid "Launch My Web Accounts"
-msgstr "تور ھ�ساباتىمنى ئاچ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ئىشلەتكۈچى ئاتى:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "قوللان(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "تىزىمغا كىر(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "بۇ ھ�سابات مۇلازىم�تىردا ئاللىقاچان بار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "مۇلازىم�تىردا ي�ڭى ھ�سابات قۇرىدۇ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
-msgid "Ca_ncel"
-msgstr "ۋاز كەچ(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ئۈستىدىكى %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ھ�سابات"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "ي�ڭى ھ�سابات"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>مەسىلەن:</b> م�نىڭ ئاتىم"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "ئىم(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "ئالىي"
+msgid "Screen _Name:"
+msgstr "ئاتى"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>مەسىلەن:</b> م�نىڭ ئاتىم"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "ئىم(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "ئىم ئەستە تۇت"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "ئىمنى ئەستە تۇتۇش"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ئ�غىز(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "ئىم ئەستە تۇت"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "ئاتى"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "مۇلازىم�تىر(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM دىكى ئىمىڭىز؟"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "ئالىي"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "AIM دىكى ئاتىڭىز؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ئ�غىز(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM دىكى ئىمىڭىز؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "مۇلازىم�تىر(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>مىسال:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "ئىمنى ئەستە تۇتۇش"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "تىزىمغا كىرىش ID: (_D)"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>مىسال:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "GroupWise ئىشلەتكۈچى كىملىكىڭىز ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "GroupWise دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>مىسال:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ھەرپ توپلىمى(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ICQ دىكى ئاتىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "ئاپتوماتىك"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "خەتلەت"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "تاللانما"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "يوق"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "ھەرپ توپلىمى:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "تور"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "تور:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "ھەرپ توپلىمى:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "مۇلازىم�تىر"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "نۇرغۇن IRC مۇلازىمەتلىرى ئىم تەلەپ قىلمايدۇ، بىلمىسىڭىز ئىمنى كىرگۈزمەڭ."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "تەخەللۇس:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "ئىم:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "ئاخىرلاشتۇرۇش ئۇچۇرى:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "تولۇق ئىسىم:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "مۇلازىم�تىر"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "قايسى IRC تورى؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "What is your IRC nickname?"
 msgstr "IRC دىكى لەقىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "قايسى IRC تورى؟"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Facebook دىكى ئاتىڭىز؟"
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr "بۇ سىزنىڭ ئىشلەتكۈچى ئاتىڭىزدۇر. Facebook قا كىرىشتە ئىشلىتىدىغىنى ئەمەس.\n"
+" ئەگەر سىز Facebook دا facebook.com/<b>badger</b> بولسىڭىز، <b>badger</b> دەپ كىرگۈزۈڭ.\n"
+"ئەگەر بۇنداق ئاتىڭىز بولمىسا <a href=\"http://www.facebook.com/username/\">بۇ يەرگە</a> ب�رىپ، Facebook دىكى ئىشلەتكۈچى ئاتىڭىزنى تاللاڭ."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "Facebook دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "Google دىكى كىملىكىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
 msgstr "<b>مىسال:</b> user@gmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "Google دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>مىسال:</b> user@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "شى�ىرلاش زۆرۈر(TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
 msgstr "SSL ئىسپاتنامىسىدىكى خاتالىققا پەرۋا قىلما(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "مۇلازىم�تىر تەڭشىكىنى قاپلاش"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
 msgstr "ئالدىنلىقى(_T):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
 msgstr "مەنبە(_U):"
 
-#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"بۇ سىزنىڭ ئىشلەتكۈچى ئاتىڭىزدۇر. Facebook قا كىرىشتە ئىشلىتىدىغىنى ئەمەس.\n"
-" ئەگەر سىز Facebook دا facebook.com/<b>badger</b> بولسىڭىز، <b>badger</b> "
-"دەپ كىرگۈزۈڭ.\n"
-"ئەگەر بۇنداق ئاتىڭىز بولمىسا <a href=\"http://www.facebook.com/username/"
-"\">بۇ يەرگە</a> ب�رىپ، Facebook دىكى ئىشلەتكۈچى ئاتىڭىزنى تاللاڭ."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "كونا SS_L نى ئىشلەت"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Facebook password?"
-msgstr "Facebook دىكى ئىمىڭىز؟"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "شى�ىرلاش زۆرۈر(TLS/SSL)(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Facebook دىكى ئاتىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
-msgstr "Google دىكى كىملىكىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Google password?"
-msgstr "Google دىكى ئىمىڭىز؟"
+msgid "Use old SS_L"
+msgstr "كونا SS_L نى ئىشلەت"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "مۇلازىم�تىر تەڭشىكىنى قاپلاش"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Jabber دىكى كىملىكىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Jabber دىكى ئىمىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Jabber دىكى ئارزۇ قىلغان كىملىكىڭىز ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Jabber دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Jabber دىكى ئارزۇ قىلغان ئىمىڭىز ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>مىسال:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Windows Live دىكى كىملىكىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Windows Live دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ئ�لخەت ئادر�سى(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "لەقىمى(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "تەگاتى(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "ئاتى(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "ئ�لان قىلغان ئاتى(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber كىملىكى(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "تەگاتى(_L):"
+msgid "E-_mail address:"
+msgstr "ئ�لخەت ئادر�سى(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "ئ�لان قىلغان ئاتى(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ئىشلەتكۈچى ئاتى(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>مىسال:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "سالاھىيەت دەلىللەشتە ئىشلىتىدىغان ئىشلەتكۈچى ئاتى:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Binding نى بايقاش"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN مۇلازىم�تىرىنى ئاپتوماتىك تاپىدۇ"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "بۇ ھ�ساباتنى ئۆي ت�ل��ونلىرى ۋە يان�ونلارغا ت�ل��ون قىلىش ئۈچۈن ئىشلەت(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS خاتلىقلىرىغا پەرۋا قىلما"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal تاللانمىلىرى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "ئىنت�رۋال(س�كۇنت)"
+msgid "Proxy Options"
+msgstr "ۋاكالەتچى تاللانمىلىرى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive تاللانمىسى"
+msgid "Miscellaneous Options"
+msgstr "باشقا تاللانمىلار"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ئازادە يول باشلاش"
+msgid "STUN Server:"
+msgstr "STUN مۇلازىم�تىرى:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "م�خانىزمى:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN مۇلازىم�تىرىنى ئاپتوماتىك تاپىدۇ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "باشقا تاللانمىلار"
+msgid "Discover Binding"
+msgstr "Binding نى بايقاش"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal تاللانمىلىرى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "مۇلازىم�تىر:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive تاللانمىسى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ئ�غىز:"
+msgid "Mechanism:"
+msgstr "م�خانىزمى:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "ۋاكالەتچى تاللانمىلىرى"
+msgid "Interval (seconds)"
+msgstr "ئىنت�رۋال(س�كۇنت)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "سالاھىيەت دەلىللەشتە ئىشلىتىدىغان ئىشلەتكۈچى ئاتى:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "توشۇش:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN مۇلازىم�تىرى:"
+msgid "Loose Routing"
+msgstr "ئازادە يول باشلاش"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "مۇلازىم�تىر:"
+msgid "Ignore TLS Errors"
+msgstr "TLS خاتالىقلىرىغا پەرۋا قىلما"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "توشۇش:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "What is your SIP account password?"
-msgstr "SIP ھ�ساباتىڭىزنىڭ ئىمى ن�مە؟"
+msgid "Port:"
+msgstr "ئ�غىز:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP login ID?"
 msgstr "SIP ھ�ساباتىڭىزنىڭ كىملىكى ن�مە؟"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "_Username:"
-msgstr "ئىشلەتكۈچى ئاتى(_U):"
+msgid "What is your SIP account password?"
+msgstr "SIP ھ�ساباتىڭىزنىڭ ئىمى ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "ياخۇ (Yahoo! ID) كىملىكى:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "يىغىن ۋە سۆھبەتخانا تەكلىپىگە پەرۋا قىلما"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ئۆيلەر تىزىمىنىڭ ئورنى:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ياخۇ (Yahoo! ID) كىملىكىڭىز ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ياخۇ (Yahoo! ID) ئىمىڭىز ن�مە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "ياخۇ (Yahoo! ID) كىملىكى:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ئۆيلەر تىزىمىنىڭ ئورنى:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "رەسىمنى ئايلاندۇرالمىدى"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "قوبۇل قىلغان رەسىملەرنىڭ �ورماتىنى سىست�مىڭىز قوللىمايدىكەن"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf نى "
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "رەسىمنى ھۆججەتكە ساقلىغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "باش سۈرىتىڭىزنى تاللاڭ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "رەسىمگە تارت…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "سۈرەت يوق"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "سۈرەتلەر"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "ھەممە ھۆججەتلەر"
 
@@ -1256,7 +1273,7 @@ msgid "Click to enlarge"
 msgstr "چ�كىپ چوڭايتىڭ"
 
 #: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "چاقىرىشنى باشلاشتا خاتالىق كۆرۈلدى."
 
@@ -1274,196 +1291,206 @@ msgstr "تاللانغان ئالاقەداش ئىناۋەتسىز"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
-msgstr "بۇ ك�لىشىمدە جىددىي چاقىش قىلغىلى بولمايدۇ"
+msgstr "بۇ ك�لىشىمدە جىددىي چاقىرىش قىلغىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "خۇسۇسىي سۆھبەت باشلاش مەغلۇپ بولدى"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "بۇ سۆھبەت ت�مىسىنى قوللىمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "سۆھبەت ت�مىسىنى ئۆزگەرتەلمەيسىز"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» ئىناۋەتلىك ئالاقەداش كىملىكى ئەمەس"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ھازىرقى سۆھبەتتىكى بارلىق ئۇچۇرلارنى تازىلىۋ�تىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: سۆھبەت ت�مىسىنى بەلگىلەيدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>:  ي�ڭى سۆھبەتخانىغا قوشۇلىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>:  ي�ڭى سۆھبەتخانىغا قوشۇلىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
-msgstr ""
-"/part [<chat room ID>] [<reason>]: سۆھبەتخانىدىن ئايرىلىدۇ. ھازىرقى "
-"سۆھبەتخانىدىن"
+msgstr "/part [<chat room ID>] [<reason>]: سۆھبەتخانىدىن ئايرىلىدۇ. ھازىرقى سۆھبەتخانىدىن"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: خۇسۇسىي سۆھبەت باشلايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>:خۇسۇسىي سۆھبەت باشلايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ھازىرقى مۇلازىم�تىردىكى لەقىمىنى ئۆزگەرتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: ھازىرقى سۆھبەتكە ACTION ئۇچۇرى ئەۋەتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
-msgstr ""
-"/say <message>: ھازىرقى سۆھبەتكە <ئۇچۇر> ئەۋەتىدۇ. بۇ «/» بىلەن باشلانغان "
-"ئۇچۇرنى ئەۋەتىش ئۈچۈن ئىشلىتىلىدۇ. مەسىلەن: \"/say /join ي�ڭى سۆھبەتخانىغا "
-"قوشۇلۇش ئۈچۈن ئىشلىتىلىدۇ."
+msgstr "/say <message>: ھازىرقى سۆھبەتكە <ئۇچۇر> ئەۋەتىدۇ. بۇ «/» بىلەن باشلانغان ئۇچۇرنى ئەۋەتىش ئۈچۈن ئىشلىتىلىدۇ. مەسىلەن: \"/say /join ي�ڭى سۆھبەتخانىغا قوشۇلۇش ئۈچۈن ئىشلىتىلىدۇ."
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
-msgstr "/whois <contact ID>: ئاقەداشقا مۇناسىۋەتلىك ئۇچۇرلارنى كۆرسىتىدۇ"
+msgstr "/whois <contact ID>: ئالاقەداشقا مۇناسىۋەتلىك ئۇچۇرلارنى كۆرسىتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr ""
-"/help [<command>]: بارلىق ئىشلەتكىلى بولىدىغان پروگراممىلارنى كۆرسىتىدۇ. "
-"ئەگەر <command> ب�رىلسە، ئۇنىڭ ئىشلىتىش ئۇسۇلىنى كۆرسىتىدۇ."
+msgstr "/help [<command>]: بارلىق ئىشلەتكىلى بولىدىغان پروگراممىلارنى كۆرسىتىدۇ. ئەگەر <command> ب�رىلسە، ئۇنىڭ ئىشلىتىش ئۇسۇلىنى كۆرسىتىدۇ."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "ئىشلىتىش ئۇسۇلى：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "نامەلۇم بۇيرۇق"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
-msgstr ""
-"نامەلۇم بۇيرۇق؛ /help نى ئىشلىتىپ ئىشلەتكىلى بولىدىغان بۇيرۇقلارنى كۆرۈپ "
-"ب�قىڭ"
+msgstr "نامەلۇم بۇيرۇق؛ /help نى ئىشلىتىپ ئىشلەتكىلى بولىدىغان بۇيرۇقلارنى كۆرۈپ ب�قىڭ"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ئۇچۇرنى ئەۋەتىشكە ي�تەرلىك قالدۇق پۇل يوق"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "ئۇچۇر %s' نى يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "ئۇچۇر يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "قىلالمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "توردا يوق"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ئىناۋەتسىز ئالاقەداش"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "ھوقۇقىڭىز يەتمىدى"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "ئۇچۇر بەك ئۇزۇن"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ت�خى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "نامەلۇم"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ئۇچۇر %s' نى يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1428
-#, c-format
-msgid "Error sending message: %s"
-msgstr "ئۇچۇر يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "سۆھبەت ت�مىسى:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "سۆھبەت ت�مىسىنى بەلگىلەش: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr ""
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "سۆھبەت ت�مىسى بەلگىلەنمىگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(تەۋسىيىلەر يوق)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' نى لۇغەتكە قوشۇش"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' نى لۇغەت %s غا قوشۇش"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "چىراي ئىپادىسى قىستۇرۇش"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "يوللا(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "نامزات سۆزلەر(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "ي�قىنقى خاتىرىلەرنى ئوقۇش مەغلۇپ بولدى"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ئۈزۈلدى"
@@ -1471,12 +1498,12 @@ msgstr "%s ئۈزۈلدى"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s نى %2$s چىقىرىۋەتتى"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s چىقىرىۋ�تىلدى"
@@ -1484,17 +1511,17 @@ msgstr "%s چىقىرىۋ�تىلدى"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s نى %2$s چەكلىگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s چەكلەنگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ئۆيدىن چىقىپ كەتتى"
@@ -1504,570 +1531,507 @@ msgstr "%s ئۆيدىن چىقىپ كەتتى"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ئۆيگە كىردى"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s نى ھازىر %s دەپ قارايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2588
 msgid "Disconnected"
 msgstr "ئۈزۈلدى"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "بۇ ئىمنى ساقلاپ قويسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "ئەستە ساقلا"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ھازىرچە ياق"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "قايتا سىنا"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ئىم خاتا: قايتا سىناڭ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "بۇ ئۆي ئىم ئارقىلىق قوغدالغان:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "كىرىش"
 
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
-msgstr "ئۇلاندى"
+msgstr "باغلاندى"
 
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "سۆھبەت"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "نامەلۇم ياكى ئىناۋەتسىز كىملىك"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "ئالاقەداشنى چەكلەشنى ھازىرچە ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "ئالاقەداشنى چەكلەشنى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ھوقۇق يەتمىدى"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "ئالاقەداشنى چەكلىگىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "چەكلەنگەن ئالاقەداشنى تەھرىرلەش"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "ھ�سابات:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "چەكلەنگەن ئالاقەداشلار"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "چىقىرىۋەت"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ئۇلانما ئاتىنى كۆچۈر(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ئۇلانما ئاچ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "ئالاقەداش ئۇچۇرىنى تەھرىرلەش"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "شەخسىي ئۇچۇرلارنى"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "ي�ڭى دوست"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s نى چەكلىسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "«%s» نىڭ سىز بىلەن ئالاقە قىلىشىنى راستلا چەكلىسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "چەكلە(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ئالاقەداشنى نىيىتى توغرا ئەمەس دەپ مەلۇم قىل(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "ك�يىن بىر گەپ بولسۇن(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "مۇشتەرى ئىلتىماسى"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ئىشلەتكۈچىنى چەكلە(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "گۇرۇپپىلانمىغان"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ئامراق ئادەملەر"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "«%s» د�گەن گۇرۇپپىنى راستلا چىقىرىۋ�تەمسىز؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "ئۆچۈر(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "«%s» د�گەن ئالاقەداشنى راستلا چىقىرىۋ�تەمسىز؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "ئالاقەداشلارنى ئۆچۈرۈۋاتىدۇ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact…"
-msgstr "ئالاقەداش قوش(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "ئالاقەداش چەكلە(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Chat"
-msgstr "سۆھبەت(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "ئاۋازلىق سۆزلەش(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "سىنلىق سۆزلەش(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
-msgid "_Previous Conversations"
-msgstr "ئالدىنقى سۆھبەتلەر(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
-msgid "Send File"
-msgstr "ھۆججەت ئەۋەتىش"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
-msgid "Share My Desktop"
-msgstr "ئۈستەلئۈستىنى ھەمبەھىر قىلىش"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
-msgid "Favorite"
-msgstr "يىغقۇچ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-msgid "Infor_mation"
-msgstr "ئۇچۇر(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
-msgid "Inviting you to this room"
-msgstr "سىزنى بۇ ئۆيگە تەكلىپ قىلىۋاتىدۇ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
-msgid "_Invite to Chat Room"
-msgstr "سۆھبەتخانىغا تەكلىپ قىل(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "ك�يىن بىر گەپ بولسۇن(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ئالاقەداشلارنى ئىزدەش"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "ئىزدە: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "ئالاقەداش قوش(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "ئالاقەداش ت�پىلمىدى"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ئالاقەداش تاللايدۇ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "تولۇق ئاتى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ت�ل��ون نومۇرى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ئ�لخەت ئادر�س"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "تور ب�كىتى:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "ئۆزىڭىزنى تونۇشتۇرىدىغان ئۇچۇر:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "تۇغۇلغان كۈنى:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "توردا بار ۋاقتىڭىزدا مەن سىزنى كۆرەلەيدىغان بولاي. تەشەككۈرلەر!"
 
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ئەڭ ئاخىرقى كۆرۈنگەن ۋاقتى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "باغلانغان يەر:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "جايىدا يوق ئۇچۇرى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "قانال:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "دۆلەتنىڭ ISO كودى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "دۆلەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ھالەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "شەھەر:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "رايون:%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "پوچتا نومۇرى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "كوچا:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "بىنا:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "قەۋەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ئۆي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "ت�كىست:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "چۈشەندۈرۈش:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "توغرىلىق دەرىجىسى"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "خاتالىق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "تىك يۆنىلىشتىكى خاتالىقى(م�تىر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "توغرا يۆنىلىشتىكى خاتالىقى(م�تىر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "سۈرئەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "يۆنىلىش:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "يامىشىش ت�زلىكى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "ئاخىرقى ي�ڭىلانغان:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "م�رىدىئان(ئۇزۇنلۇق):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "كەڭلىك:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "ئ�گىزلىك(د�ڭىز يۈزىدىن):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "ئورنى"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s، %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e، %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "باش سۈرىتىنى ساقلاش"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "باش سۈرىتىنى ساقلىغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>ئورۇن</b> ۋاقتى (چ�سلا)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "شەخسىي تەپسىلاتلار"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
-msgid "Alias:"
-msgstr "تەخەللۇس:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "خ�رىدار تەپسىلاتلىرى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "خ�رىدار ئۇچۇرى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "تولۇق ئاتى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "خ�رىدار:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "ت�ل��ون نومۇرى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "خ�رىدار تەپسىلاتى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "ئ�لخەت ئادر�سى"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "تورتۇرا"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "تۇغۇلغان كۈن"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "ئەڭ ئاخىرقى كۆرۈنگەن ۋاقتى:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "باغلانغان يەر:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "جايىدا يوق ئۇچۇرى:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Network"
+msgid "work"
+msgstr "خىزمەت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "باش بەت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Profile"
+msgid "mobile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr ""
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "بەلگە:"
+msgstr "كىملىك:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "تەخەللۇس:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ئورۇن</b> ۋاقتى (چ�سلا)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "ئۇچۇر تەلەپ قىلىندى…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "خ�رىدار ئۇچۇرى"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "نەشرى:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "خ�رىدار:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "گۇرۇپپىلار"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
-msgstr ""
-"بۇ ئالاقەداشنى قوشىدىغان گۇرۇپپىنى تاللاڭ. دىققەت: بىر ياكى بىر نەچچىنى "
-"تاللىيالايسىز، ھەتتا تاللىمىسىڭىزمۇ بولىدۇ."
+msgstr "بۇ ئالاقەداشنى قوشىدىغان گۇرۇپپىنى تاللاڭ. دىققەت: بىر ياكى بىر نەچچىنى تاللىيالايسىز، ھەتتا تاللىمىسىڭىزمۇ بولىدۇ."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "گۇرۇپپا قوش(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "تاللا"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "گۇرۇپپا"
 
@@ -2081,63 +2045,154 @@ msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "تۆۋەندىكى كىملىكلەرنى چەكلىگىلى بولمىدى:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "ئۇلانغان ئالاقەداشلار"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "ئۇلايدىغان ئالاقەداشنى تاللاش"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "ي�ڭى ئالاقەداشنى ئالدىن كۆرۈش"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "تىزىمدا تاللانغان ئالاقەداشلار ئوز-ئارا ئۇلىنىدۇ."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "ئالاقەداش ئۇچۇرىنى تەھرىرلەش"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "ت�ل��ون قىلىشتا ئىشلىتىدىغان ھ�ساباتنى تاللاش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "چاقىر"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+#| msgid "Profile"
+msgid "Mobile"
+msgstr "يان�ون"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "ئىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "ئۆي"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ئالاقەداش چەكلە(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "سۆھبەت(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "ئاۋازلىق سۆزلەش(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "سىنلىق سۆزلەش(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "ئالدىنقى سۆھبەتلەر(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ھۆججەت ئەۋەتىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "ئۈستەلئۈستىنى ھەمبەھىر قىلىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "يىغقۇچ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ئورنىتىلمىغان"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "ئۇچۇر(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ئالاقەداشلارنى ئۇلاش(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "سىزنى بۇ ئۆيگە تەكلىپ قىلىۋاتىدۇ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "سۆھبەتخانىغا تەكلىپ قىل(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "ئالاقەداش قوش(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "ئۆچۈرۈش ۋە چەكلەش(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "«%s» د�گەن گۇرۇپپىنى راستلا چىقىرىۋ�تەمسىز؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "ئۆچۈر(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "«%s» د�گەن ئالاقەداشنى راستلا چىقىرىۋ�تەمسىز؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
-msgstr ""
-"ئۇلانغان ئالاقەداش «%s» نى راستلا چىقىرىۋ�تەمسىز؟ بۇنداقتا بۇنىڭغا ئۇلانغان "
-"باشقا بارلىق ئالاقەداشلارمۇ چىقىرىۋ�تىلىدۇ."
+msgstr "ئۇلانغان ئالاقەداش «%s» نى راستلا چىقىرىۋ�تەمسىز؟ بۇنداقتا بۇنىڭغا ئۇلانغان باشقا بارلىق ئالاقەداشلارمۇ چىقىرىۋ�تىلىدۇ."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "ئالاقەداشلارنى ئۆچۈرۈۋاتىدۇ"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2147,23 +2202,23 @@ msgstr[0] "ئۇلانغان ئالاقەداشنىڭ %u ئالاقەداشى بØ
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ئورۇن</b> ۋاقتى (چ�سلا)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "يان�ون ياكى يۆتكەلمە ئۈسكىنىدىن تورغا باغلىنىش"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "يەڭ تور"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC تورىنى تاللاش"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "تور تىزىمىنى ئەسلىگە قايتۇرۇش(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "تاللا"
@@ -2176,239 +2231,273 @@ msgstr "ي�ڭى مۇلازىم�تىر"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "ئالاقەداشلارنى ئۇلاش"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ئۈزۈش(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"كۆرسىتىلگەن ئۇلانغان ئالاقەداشلارنى ئۇلانمىغان، ئايرىم-ئايرىم ئالاقەداشقا "
-"پارچىلايدۇ."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ئۇلانما(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ئۇلانغان ئالاقەداش «%s» نى ئۇزسۇنمۇ؟"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"ئۇلانغان ئالاقەداشلارنى راستلا ئۈزەمسىز؟ بۇنداقتا ئۇلانغان باشقا بارلىق "
-"ئالاقەداشلار ئايرىم-ئايرىم ئالاقەداشقا ئايلىنىپ ك�تىدۇ."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ئۈز(_U)"
+#: ../libempathy-gtk/empathy-log-window.c:620
+msgid "History"
+msgstr "تارىخ"
 
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "كۆرسەت"
 
-#: ../libempathy-gtk/empathy-log-window.c:527
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "ئىزدە"
 
-#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%A، %e %B %Y %X"
+#: ../libempathy-gtk/empathy-log-window.c:1148
+#, c-format
+#| msgid "Chat with %s"
+msgid "Chat in %s"
+msgstr "%s نىڭدا سۆزلىشىۋاتىدۇ"
 
-#: ../libempathy-gtk/empathy-log-window.c:747
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s بىلەن سۆزلىشىش"
 
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A، %e %B %Y %X"
+
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s س�كۇنت"
 
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s مىنۇت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "سۆزلەشكەن ۋاقىت %s، ئاخىرلاشقان ۋاقىت %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "بۈگۈن"
 
-#: ../libempathy-gtk/empathy-log-window.c:1217
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "تۈنۈگۈن"
 
-#: ../libempathy-gtk/empathy-log-window.c:1233
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+#| msgctxt ""
+#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#| msgid "%e %B %Y"
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "خالىغان چاغدا"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "ھەركىم"
 
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "كىم"
 
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "قاچان"
 
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Ú¾Û�Ú†Ù†Û�Ù…Û•"
 
-#: ../libempathy-gtk/empathy-log-window.c:2274
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
-msgstr "ت�كىستلىق سۆزلىشىش"
+msgstr "ت�كىستلىك سۆزلىشىش"
 
-#: ../libempathy-gtk/empathy-log-window.c:2276
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2281
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "كىرگەن چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2282
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "چىققان چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2283
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "سۆزلەشمىگەن چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2304
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Ù†Û�Ù…Û•"
 
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "بۇرۇنقى سۆزلىشىش خاتىرىسىنىڭ ھەممىسىنى ئۆچۈرۈۋ�تەمسىز؟"
 
-#: ../libempathy-gtk/empathy-log-window.c:2921
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "ھەممىنى تازىلا"
 
-#: ../libempathy-gtk/empathy-log-window.c:2928
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "دىن ئۆچۈر:"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "چاقىر"
+msgid "_File"
+msgstr "ھۆججەت(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "سۆھبەت"
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "History"
-msgstr "تارىخ"
+msgid "Delete All History..."
+msgstr "بارلىق ئىزلارنى ئۆچۈرۈش…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "سەپلىمە ھۆججەت"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "سىن"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "پاراڭ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "_File"
-msgstr "ھۆججەت(_F)"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "سىن"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
 msgid "page 2"
 msgstr "2-بەت"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ئالاقەداش كىملىكى:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ئوقۇۋاتىدۇ...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
-msgid "C_hat"
-msgstr "سۆھبەت(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "ھوقۇقىڭىز يەتمىدى"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "ي�ڭى سۆھبەت"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
-msgid "Send _Video"
-msgstr "سىن ئەۋەت(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "سىنلىق سۆزلەش(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
-msgid "C_all"
-msgstr "چاقىر(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "ئاۋازلىق سۆزلەش(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "ي�ڭى چاقىرىش"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
-msgstr ""
-"تۆۋەندىكى ھ�ساباتىڭىزنىڭ ئىمىنى كىرگۈزۈڭ\n"
+msgstr "تۆۋەندىكى ھ�ساباتىڭىزنىڭ ئىمىنى كىرگۈزۈڭ\n"
 "<b>%s</b>"
 
 #. COL_STATUS_TEXT
@@ -2417,34 +2506,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "ئىختىيارىي ئۇچۇر..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "چەكسىڭىز بۇ ھالەتنى ئامراق ھالەتتىن چىقىرىۋ�تىدۇ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "چەكسىڭىز بۇ ھالەتنى ئامراق ھالەت قىلىدۇ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "ھالەتنى تەڭشەش"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "سىزنىڭ ھازىرقى ھالىتىڭىزنى ب�كىتىدۇ"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "ئىختىيارىي ئۇچۇر..."
 
@@ -2452,30 +2537,33 @@ msgstr "ئىختىيارىي ئۇچۇر..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "ي�ڭى %s ھ�ساباتى"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "ك�يىنكىنى ئىزدە"
+msgid "Find:"
+msgstr "ئىزدە:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "ك�يىنكىنى ئىزدە"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "ئالدىنقى(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "ئىزدە:"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "ك�يىنكى(_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "دەل ماسلاش"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "چوڭ كىچىكلىكىگە ماسلاش(_C)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
-msgstr "ئىبارە ت�پىلمىدى"
+msgstr "ئاتالغۇنى تاپالمىدى"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2517,39 +2605,33 @@ msgstr "چىققان ئاۋازلىق چاقىرىش"
 msgid "Voice call ended"
 msgstr "ئاۋازلىق چاقىرىش ئاخىرلاشتى"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "ئىختىيارى ئۇچۇر كىرگۈزۈش"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "ي�ڭى ھالەت ئۇچۇرىنى ساقلا(_N)"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "ساقلانغان ھالەت ئۇچۇرى"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "ئۇچۇر %s دە تەھرىرلەندى"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "نورمال"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "كلاسسىك"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "ئاددىي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "پاكىز"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "ÙƒÛ†Ùƒ"
 
@@ -2575,9 +2657,7 @@ msgstr "ئىسپاتنامىدە ئارزۇ قىلغان بارماق ئىزى Ù
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr ""
-"ئىسپاتنامە ئارقىلىق تەكشۈرگەن كومپيۇت�ر ئاتى مۇلازىم�تىر ئاتى بىلەن "
-"ماسلاشمىدى."
+msgstr "ئىسپاتنامە ئارقىلىق تەكشۈرگەن كومپيۇت�ر ئاتى مۇلازىم�تىر ئاتى بىلەن ماسلاشمىدى."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
@@ -2611,43 +2691,46 @@ msgid "Certificate hostname: %s"
 msgstr "ئىسپاتنامىنىڭ كومپيۇت�ر ئاتى: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "داۋاملاشتۇر"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "داۋاملاشتۇر(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "بۇ باغلىنىش ئىشەنچسىز. داۋاملاشتۇرۇۋ�رەمسىز؟"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "بۇنى ئەستە ساقلاپ بۇنىڭدىن ك�يىنكى باغلىنىشتا ئىشلەت"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ئىسپاتنامە تەپسىلاتلىرى"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI نى ئاچقىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
-msgstr "ھۆججەت تاللاش"
+msgstr "بىر ھۆججەت تاللاڭ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "ھۆججەتنى ساقلايدىغانغا ي�تەرلىك بوشلۇق يوق"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
-msgstr ""
-"بۇ ھۆججەتنى ساقلاش ئۈچۈن %s بوشلۇق ك�رەك، بىراق %s بوشلۇق بار ئىكەن. باشقا "
-"يەرگە ساقلاڭ."
+msgstr "بۇ ھۆججەتنى ساقلاش ئۈچۈن %s بوشلۇق ك�رەك، بىراق %s بوشلۇق بار ئىكەن. باشقا يەرگە ساقلاڭ."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s دىن كەلگەن ھۆججەت"
@@ -2712,7 +2795,7 @@ msgstr "سلاۋيانچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:224
 msgid "Cyrillic/Russian"
-msgstr "رۇسچە/سلاۋىيان"
+msgstr "رۇسچە/سلاۋيان"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:227
 #: ../libempathy-gtk/totem-subtitle-encoding.c:229
@@ -2721,7 +2804,7 @@ msgstr "سلاۋيانچە/ئۇكرائىنچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:232
 msgid "Georgian"
-msgstr "گرۇزىنچە"
+msgstr "گىرۇزىنچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:235
 #: ../libempathy-gtk/totem-subtitle-encoding.c:237
@@ -2731,7 +2814,7 @@ msgstr "گىر�كچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr "گۇجاراتى"
+msgstr "گۇجاراتچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
@@ -2819,49 +2902,38 @@ msgstr "غەربچە"
 msgid "Vietnamese"
 msgstr "ۋىي�تنامچە"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "تاللانغان ئالاقەداش ھۆججەتنى تاپشۇرۇپ ئالالمايدۇ."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "تاللانغان ئالاقەداش توردا يوق."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "خاتالىق ئۇچۇرى يوق"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "مۇڭداشقۇ ئۇچۇرى(Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "قوزغالغاندا باغلانما"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-"قوزغالغاندا ئالاقەداشلار تىزىمى ياكى باشقا ھ�چقانداق سۆزلەشكۈنى كۆرسەتمىسۇن"
+msgstr "قوزغالغاندا ئالاقەداشلار تىزىمى ياكى باشقا ھ�چقانداق سۆزلەشكۈنى كۆرسەتمىسۇن"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy مۇڭداشقۇ خ�رىدارى"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Account Manager(ھ�سابات باشقۇرغۇ) غا باغلىنىۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
 "\n"
 "%s"
-msgstr ""
-"Telepathy ھ�سابات باشقۇرغۇ بىلەن باغلىنىشتا خاتالىق كۆرۈلدى. خاتالىق "
-"تۆۋەندىكىچە:\n"
+msgstr "Telepathy ھ�سابات باشقۇرغۇ بىلەن باغلىنىشتا خاتالىق كۆرۈلدى. خاتالىق تۆۋەندىكىچە:\n"
 "\n"
 "%s"
 
@@ -2871,11 +2943,7 @@ msgid ""
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
-msgstr ""
-"Empathy ئەركىن يۇمشاق د�تال؛ سىز ئەركىن يۇمشاق د�تال �وندى تارقاتقان GNU "
-"ئادەتتىكى ئاممىۋى ئىجازەتنامىسىنىڭ ماددىلىرىغا ئاساسەن ئۇنى ئەركىن تارقىتىپ "
-"ياكى ئۆزگەرتسىڭىز بولىدۇ؛  ئىجازەتنامىنىڭ ئىككىنچى نەشرى ياكى ئۇنىڭدىن "
-"ك�يىنكى نەشرىنى ئىشلىتىڭ."
+msgstr "Empathy ئەركىن يۇمشاق د�تال؛ سىز ئەركىن يۇمشاق د�تال �وندى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامىسىنىڭ ماددىلىرىغا ئاساسەن ئۇنى ئەركىن تارقىتىپ ياكى ئۆزگەرتسىڭىز بولىدۇ؛  ئىجازەتنامىنىڭ ئىككىنچى نەشرى ياكى ئۇنىڭدىن ك�يىنكى نەشرىنى ئىشلىتىڭ."
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2883,922 +2951,642 @@ msgid ""
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
-msgstr ""
-"Empathy نى تارقىتىشنىڭ مەقسىتى ئۇنىڭ سىزگە ك�رەكلىك بولۇشى ئۈچۈن، ئەمما "
-"ئۇنىڭ ھ�چقانداق كاپالىتى يوق؛ ئۇنى ئىشلىتىپ ك�لىپ چىققان ھەر قانداق بىۋاسىتە "
-"ياكى ۋاسىتىلىك ئاقىۋەتكە ھ�چقانداق مەسئۇلىيەتنى ئۈستىگە ئالمايمىز. GNU "
-"ئادەتتىكى ئاممىۋى ئىجازەت ك�لىشىمىدىكى تەپسىلاتنى كۆرۈڭ."
+msgstr "Empathy نى تارقىتىشنىڭ مەقسىتى ئۇنىڭ سىزگە ك�رەكلىك بولۇشى ئۈچۈن، ئەمما ئۇنىڭ ھ�چقانداق كاپالىتى يوق؛ ئۇنى ئىشلىتىپ ك�لىپ چىققان ھەر قانداق بىۋاسىتە ياكى ۋاسىتىلىك ئاقىۋەتكە ھ�چقانداق مەسئۇلىيەتنى ئۈستىگە ئالمايمىز. GNU ئادەتتىكى ئاممىۋى ئىجازەت ك�لىشىمىدىكى تەپسىلاتنى كۆرۈڭ."
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"سىز Empathy بىلەن بىللە GNU ئادەتتىكى ئاممىۋى ئىجازەت ك�لىشىمىنىڭ "
-"كۆچۈرۈلمىسىدىن بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئەگەر تاپشۇرۇۋالمىغان بولسىڭىز "
-"ئەركىن يۇمشاق د�تال ۋەخپىسىگە خەت ي�زىڭ. ئادر�س:  Free Software Foundation,"
-"Inc., 51 Franklin  Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "سىز Empathy بىلەن بىللە GNU ئادەتتىكى ئاممىۋى ئىجازەت ك�لىشىمىنىڭ كۆچۈرۈلمىسىدىن بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئەگەر تاپشۇرۇۋالمىغان بولسىڭىز ئەركىن يۇمشاق د�تال ۋەخپىسىگە خەت ي�زىڭ. ئادر�س:  Free Software Foundation,Inc., 51 Franklin  Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME دىكى مۇڭداشقۇ خ�رىدارى"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Burkut https://launchpad.net/~burkut\n"
-"  Gheyret T.Kenji https://launchpad.net/~gheyretkenji"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ھ�ساباتنى ئىمپورت قىلىۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "ھ�سابات تەپسىلاتىنى تەھلىل قىلىۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "ھ�سابات قۇرۇۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "خاتالىق ئۇچۇرى: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"سىز كەينىگە قايتىپ ھ�سابات قايتا تەپسىلاتىنى كىرگۈزسىڭىز ياكى بۇ ياردەمچىنى "
-"ئاخىرلاشتۇرۇپ، ك�يىن «تەھرىر» تىزىملىكى ئارقىلىق ھ�سابات قوشسىڭىز بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "خاتالىق كۆرۈلدى"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "قانداق تىپتىكى ھ�ساباتىڭىز بار؟"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "يەنە باشقا تەڭشىمەكچى بولغان سۆھبەت ھ�ساباتىڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "ھ�ساباتىڭىزنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "قانداق تىپتىكى ھ�سابات قۇرغۇڭىز بار؟"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "باشقا مۇڭداشقۇ ھ�ساباتى قۇرغۇڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "ي�ڭى ھ�ساباتنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy ئىشلىتىپ سىز توردىكى قوشنىلىرىڭىز ۋە Google سۆھبەت، AIM، Windows "
-"Live ۋە باشقا سۆھبەت پروگراممىلىرىنى ئىشلىتىدىغان دوست، ساۋاقداشلىرىڭىز "
-"بىلەن مۇڭدىشالايسىز. مىكرو�ون ۋە تور كام�راسى بولسا ئاۋازلىق ۋە سىنلىق "
-"مۇڭداشقىلىمۇ بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "باشقا مۇڭداشقۇلاردا ئىشلەتكەن ھ�ساباتىڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ھەئە، ھ�ساباتىمنىڭ تەپسىلاتىنى ئىمپورت قىلىمەن "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ھەئە، ھ�ساباتىمغا ئائىت تەپسىلاتلارنى كىرگۈزىمەن"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "ياق، ي�ڭى ھ�سابات قۇرغۇم بار"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "ياق، م�نىڭ ي�قىندىكى كىشىلەرنى ھازىرلا كۆرگۈم بار"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ئىمپورت قىلماقچى بولغان ھ�ساباتلارنى تاللاڭ:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ھەئە"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "ياق، ھازىرچە مۇشۇلارلا"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy سىز بىلەن ئوخشاش توردىكى باشقىلارنى ئىزدەپ تاپالايدۇ ھەم "
-"سۆزلىشەلەيدۇ. بۇ ئىقتىدارىنى ئىشلەتمەكچى بولسىڭىز، تۆۋەندىكى تەپسىلاتلار "
-"توغرىمۇ تەكشۈرۈڭ. بۇ تەپسىلاتلارنى ك�يىن ئۆزگەرتكىلى ياكى بۇ ئىقتىدارنى "
-"«ھ�سابات» سۆزلەشكۈسىدە چەكلىۋاتقىلىمۇ بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "تەھرىر->ھ�ساباتلار"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "بۇ ئىقتىدارنى ھازىرلا ئىناۋەتلىك قىلغۇم يوق(_N)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"ئەگەر telepathy-salut ئورنىتىلمىغان بولسا سىز يەرلىك توردىكى باشقىلار بىلەن "
-"سۆھبەتلىشەلمەيسىز. بۇ ئىقتىدارنى ئىشلەتمەكچى بولسىڭىز telepathy-salut "
-"بوغچىسىنى ئورنىتىڭ ۋە «ھ�سابات» سوزلەشكۈسىنى ئىشلىتىپ بىر دانە «قوشنىلار» "
-"ھ�ساباتىدىن بىرنى قۇرۇڭ."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ئورنىتىلمىغان"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ئۇچۇر ۋە VoIP ھ�ساباتلىرى ياردەمچىسى"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Empathy غا مەرھابا"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "ئۆزىڭىزنىڭ ھ�ساباتلىرىنى ئىمپورت قىلىدۇ"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "تەپسىلاتىنى كىرگۈزۈڭ"
+msgstr "Gheyret Kenji <gheyret@gmail.com>\n"
+"Sahran<sahran@live.com>"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "سىزنىڭ %s ھ�ساباتىڭىزدا ت�خى ساقلانمىغان ئۆزگىرىشلەر بار."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "ي�ڭى ھ�ساباتىڭىز ت�خى ساقلانمىدى."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "باغلىنىۋاتىدۇ…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "توردا يوق — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "ئۈزۈلدى — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "توردا يوق — تور باغلىنىشى يوق"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "نامەلۇم ھالەت"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "توردا يوق — ھ�سابات چەكلەنگەن"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"ي�ڭى ھ�سابات قۇرماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
-"ئۆزگىرىشلەر يوق بولۇپ ك�تىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "كومپيۇت�رىڭىزدىن %s نى چىقىرىۋ�تەمسىز؟"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "بۇ مۇلازىم�تىردىكى ھ�ساباتىڭىزنى چىقىرىۋەتمەيدۇ."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr ""
-"باشقا ھ�ساباتنى تاللىماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+msgstr "باشقا ھ�ساباتنى تاللىماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
 "ئۆزگىرىشلەر يوق بولۇپ ك�تىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "قوزغات(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
-msgstr "قوزغاتما(_D)"
+msgstr "چەكلە(_D)"
+
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "ئۆتكۈزۈۋەت(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "باغلا(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr ""
-"كۆزنەكنى ياپماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+msgstr "كۆزنەكنى ياپماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
 "ئۆزگىرىشلەر يوق بولۇپ ك�تىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "ھ�سابات ئۇچۇرىنى ئوقۇۋاتىدۇ"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "ك�لىشىم ئورنىتىلمىغان"
+#| msgid "_Add…"
+msgid "Add…"
+msgstr "قوشۇش…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Protocol:"
-msgstr "ك�لىشىم:"
+msgid "_Import…"
+msgstr "ئىمپورت قىلىش(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "ھ�سابات ئۇچۇرىنى ئوقۇۋاتىدۇ"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr ""
-"ي�ڭى ھ�سابات قوشۇش ئۈچۈن، ئالدى بىلەن ئىشلەتمەكچى بولغان ك�لىشىمنىڭ ن�گىزلىك"
-"(backend) پروگراممىسىنى ئورنىتىشىڭىز ك�رەك."
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "قوش(_A)…"
+msgstr "ي�ڭى ھ�سابات قوشۇش ئۈچۈن، ئالدى بىلەن ئىشلەتمەكچى بولغان ك�لىشىمنىڭ ن�گىزلىك(backend) پروگراممىسىنى ئورنىتىشىڭىز ك�رەك."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "ئىمپورت قىلىش(_I)…"
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr ""
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy سالاھىيەت دەلىللەش خ�رىدارى"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy سالاھىيەت دەلىللەش خ�رىدارى"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "قوشنا"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy ئۈن/سىن خ�رىدار پروگراممىسى"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy ئۈن/سىن خ�رىدار پروگراممىسى"
-
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
-msgid "Contrast"
-msgstr "ئاق-قارىلىقى"
-
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
-msgid "Brightness"
-msgstr "يورۇقلۇق"
-
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
-msgid "Gamma"
-msgstr "گامما"
-
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
-msgid "Volume"
-msgstr "دىسكا"
-
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
-msgid "_Sidebar"
-msgstr "يان بالداق(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
-msgid "Audio input"
-msgstr "ئۈن كىرگۈزۈش"
-
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
-msgid "Video input"
-msgstr "سىن كىرگۈزۈش"
-
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
-msgid "Dialpad"
-msgstr "نومۇر تاختىسى"
-
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
-msgid "Details"
-msgstr "تەپسىلاتى"
-
-#. translators: Call is a noun and %s is the contact name. This string
-#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
-#, c-format
-msgid "Call with %s"
-msgstr "%s بىلەن سۆزلىشىش"
-
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
-msgid "The IP address as seen by the machine"
-msgstr "كومپيۇت�ردا ئۇچرىغان IP ئادر�سى"
-
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
-msgid "The IP address as seen by a server on the Internet"
-msgstr "ئىنت�رن�تتىكى مۇلازىم�تىردا ئۇچرىغان IP ئادر�سى"
-
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
-msgid "The IP address of the peer as seen by the other side"
-msgstr "قارشى تەرەپتە ئۇچرىغان تەڭتۇش(peer)  IP ئادر�سى"
-
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
-msgid "The IP address of a relay server"
-msgstr "ئۇلاپ تارقىتىش مۇلازىم�تىرىنىڭ IP ئادر�سى"
-
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
-msgid "The IP address of the multicast group"
-msgstr "كۆپ ئادر�سلىق خەۋەرلىشىش گۇرۇپپىسىنىڭ IP ئادر�سى"
-
-#: ../src/empathy-streamed-media-window.c:1884
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1887
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1890
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1893
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "باغلاندى — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
-msgid "Technical Details"
-msgstr "ت�خنىكىلىق تەپسىلات"
-
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s's يۇمشاق د�تالى كومپيۇت�رىڭىزدا بار بولغان ھ�چقانداق ئۈن �ورماتىنى "
-"تونۇمىدى."
-
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s's يۇمشاق د�تالى كومپيۇت�رىڭىزدا بار بولغان ھ�چقانداق سىن �ورماتىنى "
-"تونۇمىدى."
-
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"%s نىڭ بىلەن باغلىنىش قۇرالمىدى. سىزنىڭ ياكى قارىشى تەرەپنىڭ بىۋاسىتە "
-"باغلىنىشقا رۇخسەت قىلىنمىغان بولۇشى مۇمكىن."
-
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
-msgid "There was a failure on the network"
-msgstr "توردا خاتالىق يۈز بەردى"
-
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان ئۈن �ورماتلىرى كومپيۇت�رغا ئورنىتىلماپتۇ"
-
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان سىن �ورماتلىرى كومپيۇت�رغا ئورنىتىلماپتۇ"
-
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy بۆلىكىدە غەلىتىلىك يۈز بەردى. «ياردەم» تىزىملىكىدىكى «سازلاش» "
-"كۆزنىكىدە خاتىرىلىگەن ئۇچۇرلار بىلەن قوشۇپ <a href=\"%s\">بۇ كەمتۈكنى مەلۇم "
-"قىلىڭ</a>."
-
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
-msgid "There was a failure in the call engine"
-msgstr "چاقىرىش ماتورىدا خاتالىق يۈز بەردى"
-
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
-msgid "The end of the stream was reached"
-msgstr "ئ�قىم ئاخىرلاشتى"
-
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
-msgid "Can't establish audio stream"
-msgstr "ئۈن ئ�قىمىنى قۇرغىلى بولمىدى"
-
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
-msgid "Can't establish video stream"
-msgstr "سىن ئ�قىمىنى قۇرغىلى بولمىدى"
-
 #: ../src/empathy-call-window.ui.h:1
-msgid "Audio"
-msgstr "ئۈن"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "ئالاقەداشنى قايتا چاقىرىش"
+msgid "_Call"
+msgstr "چاقىر(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "كام�را ئ�تىك"
+msgid "_Microphone"
+msgstr "مىكرو�ون(_C)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "كام�را ئوچۇق"
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "كام�را(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "كودسىزلىغۇچ:"
+msgid "_Settings"
+msgstr "تەڭشەك(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "كام�رانى ئىناۋەتسىز قىلىپ سىن يوللاشنى توختىتىدۇ"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "كۆرۈنۈش(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "كام�رانى قوزغىتىپ سىن يوللا"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "ياردەم(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "كام�رانى قوزغات بىراق سىننى يوللىما"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "مەزمۇنلار(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "كودلىغۇچلار:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "سازلا(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "توختىتىپ قويۇش"
+msgid "Swap camera"
+msgstr "كام�را ئالماشتۇر"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ھازىرقى سۆزلىشىشنى توختىتىپ قويۇش"
+msgid "Minimise me"
+msgstr "م�نى ئەڭ كىچىك قىل"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "يەرلىك نامزات:"
+msgid "Maximise me"
+msgstr "م�نى ئەڭ چوڭ قىل"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "ئالدىن كۆزەت"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "كام�رانى ئىناۋەتسىز قىلىش"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "قايتا چاقىرىش"
+msgid "Hang up"
+msgstr "توختىتىپ قويۇش"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "يىراقتىكى كاندىدات:"
+msgid "Hang up current call"
+msgstr "ھازىرقى سۆزلىشىشنى توختىتىپ قويۇش"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ئۈن ئەۋەتىش"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "سىنلىق سۆزلىشىش"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ئۈن تارقىتىشىنى ئالماشتۇرۇش(ئ�چىش ياكى ئ�تىش)"
-
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824
-#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826
-#: ../src/empathy-call-window.c:1827
-msgid "Unknown"
-msgstr "نامەلۇم"
+msgid "Start a video call"
+msgstr "سىنلىق سۆزلىشىشنى باشلايدۇ"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "سىن(_I)"
+msgid "Start an audio call"
+msgstr "ئاۋازلىق سۆزلىشىشنى باشلايدۇ"
+
+#: ../src/empathy-call-window.ui.h:20
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "نومۇر تاختا كۆرسەت"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "سىن ئ�تىك"
+msgid "Display the dialpad"
+msgstr "نومۇر تاختىسىنى كۆرسىتىش"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "سىن ئوچۇق"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "سىن ئەۋەتىش"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "سىننى ئالدىن كۆزىتىش"
+#| msgid "Toggle audio transmission"
+msgid "Toggle video transmission"
+msgstr "سىن تارقىتىشىنى ئالماشتۇرۇش(ئ�چىش ياكى ئ�تىش)"
 
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "چاقىر(_C)"
+msgid "Send Audio"
+msgstr "ئۈن ئەۋەتىش"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "نومۇر تاختىسى(_D)"
+msgid "Toggle audio transmission"
+msgstr "ئۈن تارقىتىشىنى ئالماشتۇرۇش(ئ�چىش ياكى ئ�تىش)"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
-msgid "_View"
-msgstr "كۆرۈنۈش(_V)"
+#: ../src/empathy-call-window.ui.h:27
+msgid "Encoding Codec:"
+msgstr "كودلىغۇچلار:"
+
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2540
+#: ../src/empathy-call-window.c:2541 ../src/empathy-call-window.c:2542
+#: ../src/empathy-call-window.c:2543
+msgid "Unknown"
+msgstr "نامەلۇم"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "كودسىزلىغۇچ:"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "Remote Candidate:"
+msgstr "يىراقتىكى كاندىدات:"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "Local Candidate:"
+msgstr "يەرلىك نامزات:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "ئۈن"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "بۇ كۆزنەكنى ياپ؟"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "كۆزنەك ياپ"
+
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ۋە %u باشقىلار)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (باشقىلاردىن %d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ھەممىسىدىن %d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ئۇچۇرنى ئەۋەتىۋاتىدۇ"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "ئۇچۇر كىرگۈزۈۋاتىدۇ."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "تازىلا(_L)"
+msgid "_Conversation"
+msgstr "سۆھبەت(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ئالاقەداش(_O)"
+msgid "C_lear"
+msgstr "تازىلا(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "چىراي ئىپادىسى قىستۇر(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ئامراق سۆھبەتخانا(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "سۆھبەتداش تەكلىپ قىلىش(_P)…"
+msgid "Notify for All Messages"
+msgstr "ھەممە ئۇچۇرلارنى ئۇقتۇرۇش قىلىش"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "بەتكۈچنى سولغا يۆتكە(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "ئالاقەداش تىزىمىنى كۆرسەت(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "بەتكۈچنى ئوڭغا يۆتكە(_R)"
+msgid "Invite _Participant…"
+msgstr "سۆھبەتداش تەكلىپ قىلىش(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ھەممە ئۇچۇرلارنى ئۇقتۇرۇش قىلىش"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "مەزمۇنلار(_C)"
+msgid "C_ontact"
+msgstr "ئالاقەداش(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "سۆھبەت(_C)"
+msgid "_Tabs"
+msgstr "بەتكۈچلەر(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "بەتكۈچنى ئايرىۋەت(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ئامراق سۆھبەتخانا(_F)"
-
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "ياردەم(_H)"
+msgid "_Previous Tab"
+msgstr "ئالدىنقى بەتكۈچ(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "ك�يىنكى بەتكۈچ(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "ئالدىنقى بەتكۈچ(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "ي�پىلغان بەتكۈچنى ئەسلىگە كەلتۈر(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "ئالاقەداش تىزىمىنى كۆرسەت(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "بەتكۈچنى سولغا يۆتكە(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "بەتكۈچلەر(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "بەتكۈچنى ئوڭغا يۆتكە(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "ي�پىلغان بەتكۈچنى ئەسلىگە كەلتۈر(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "بەتكۈچنى ئايرىۋەت(_D)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "ئاتى"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "ئۆي"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "ئاپتوماتىك باغلىنىش"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ئامراق ئۆيلەرنى باشقۇرۇش"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "كەلگەن سىنلىق چاقىرىش"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "سۆزلىشىۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s سىزنى چاقىرىۋاتىدۇ(سىنغا).  جاۋاب ب�رەمسىز؟"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s سىزنى چاقىرىۋاتىدۇ. جاۋاب ب�رەمسىز؟"
 
-#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751
-#: ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s دىن كەلگەن ت�ل��ون"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "رەت قىل(_R)"
 
-#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "جاۋاب بەر(_A)"
 
-#: ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
-msgstr " سىنلىق جاۋاب(&A)"
+msgstr "سىنلىق جاۋاب(&A)"
 
-#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s دىن كەلگەن سىنلىق چاقىرىش"
 
-#: ../src/empathy-event-manager.c:857
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "ئۆيگە تەكلىپ قىلىش"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
-msgstr "%s نىنغا قاتنىشىشقا تەكلىپ قىلىش"
+msgstr "%s نىڭغا قاتنىشىشقا تەكلىپ قىلىش"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s سىزنى %s غا قاتنىشىشنى تەكلىپ قىلىۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:874
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "رەت قىل(_D)"
 
-#: ../src/empathy-event-manager.c:879
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "قاتناش(_J)"
 
-#: ../src/empathy-event-manager.c:906
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s سىزنى %s غا تەكلىپ قىلدى"
 
-#: ../src/empathy-event-manager.c:912
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "سىز %s نىنغا تەكلىپ قىلىندىڭىز"
+msgstr "سىز %s نىڭغا تەكلىپ قىلىندىڭىز"
 
-#: ../src/empathy-event-manager.c:963
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s نىڭدىن كەلگەن ھۆججەت"
 
-#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "ئىم كىرگۈزۈڭ"
 
-#: ../src/empathy-event-manager.c:1211
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s سىزنى توردا بار چ�غىڭىزدا كۆرۈشكە ئىجازەت سوراۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:1215
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
 "Message: %s"
-msgstr ""
-"\n"
+msgstr "\n"
 "ئۇچۇر: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s،  %s/s نىڭدا"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" نى %s دىن قوبۇل قىلدى"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "«%s» نى %s غا ئەۋەتىۋاتىدۇ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "«%s» نى %s دىن قوبۇل قىلىشتا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ھۆججەت قوبۇل قىلىۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "«%s» نى %s غا يوللاۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ھۆججەت يوللاۋاتقاندا خاتالىق كۆرۈلدى"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" نى %s دىن تاپشۇرۇۋالغان"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" نى %s غا يوللايدۇ"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ھۆججەت يوللاش تاماملاندى"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "باشقا قاتناشقۇچىلارنىڭ جاۋابىنى ساقلاۋاتىدۇ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "«%s» نىڭ تولۇقلۇقىنى تەكشۈرۈۋاتىدۇ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hash قىممىتىنى ھ�سابلاۋاتىدۇ «%s»"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ھۆججەت"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "قالدى"
 
@@ -3808,643 +3596,1182 @@ msgstr "ھۆججەت يوللاش"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"تىزىمدىن تاماملانغان، ئەمەلدىن قالدۇرۇلغان ۋە مەغلۇپ بولغان ھۆججەت "
-"يوللاشلارنى چىقىرىۋ�تىش"
+msgstr "تىزىمدىن تاماملانغان، ئەمەلدىن قالدۇرۇلغان ۋە مەغلۇپ بولغان ھۆججەت يوللاشلارنى چىقىرىۋ�تىش"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "ئىمپورت قىل(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr ""
-"ئىمپورت قىلىدىغان ھ�سابات ت�پىلمىدى. Empathy دە ھازىر پەقەتلا Pidgin دىن "
-"ھ�سابات ئىمپورت قىلغىلى بولىدۇ."
+msgstr "ئىمپورت قىلىدىغان ھ�سابات ت�پىلمىدى. Empathy دە ھازىر پەقەتلا Pidgin دىن ھ�سابات ئىمپورت قىلغىلى بولىدۇ."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "ھ�ساباتلارنى ئىمپورت قىلىش"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ئەكىر"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "ك�لىشىم"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "مەنبە"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "ئىم تەمىنلەش"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ئۈز"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "ت�پىلمىدى"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "يۇمشاق د�تالنى ي�ڭىلاش…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "ياپ"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "قايتا باغلىنىش"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "ھ�ساباتنى تەھرىرلەش"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "ياپ"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "پۇل كىرگۈزۈش%s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
-msgstr ""
+msgstr "ھ�ساباتقا پۇل كىرگۈزۈش"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
-msgstr ""
+msgstr "پۇل كىرگۈزۈش…"
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
-msgstr "ئالاقىلەشكۈچى"
-
-#: ../src/empathy-main-window.c:2169
-msgid "Contact List"
-msgstr "ئالاقەداشلار تىزىملىكى"
+msgstr "ئالاقەداش"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "ھ�ساباتلارنى كۆرسىتىدۇ ۋە تەھرىرلەيدۇ"
-
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "خەرىتىدىكى ئالاقەداشلار(_M)"
-
-#: ../src/empathy-main-window.ui.h:2
-msgid "Credit Balance"
-msgstr "ك�ر�دىت قالدۇقى"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Find in Contact _List"
-msgstr "ئالاقەداشلاردىن ئىزدە(_L)"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Join _Favorites"
-msgstr "يىغقۇچقا قوش(_F)"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "ئالاقەداش تىزىمى"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "Manage Favorites"
-msgstr "يىغقۇچ باشقۇرۇش"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:6
-msgid "N_ormal Size"
-msgstr "نورمال چوڭلۇق(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "ي�ڭى سۆھبەت(_N)…"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "ي�ڭى چاقىرىش(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "باش سۈرەت ۋە نورمال چوڭلۇق"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "ئالاقەداش ئىزدەش(_S)…"
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "P_references"
-msgstr "مايىللىق(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ھۆججەت ئەۋەتىش(_F)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "توردا يوق ئالاقەداشلار(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "ك�لىشىملەرنى كۆرسەت(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "Sort by _Name"
-msgstr "ئاتى بويىچە تەرتىپلە(_N)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "كر�دىت قالدۇقى"
 
-#: ../src/empathy-main-window.ui.h:12
-msgid "Sort by _Status"
-msgstr "ھالىتى بويىچە تەرتىپلە(_S)"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "خەرىتىدىكى ئالاقەداشلار(_M)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ھ�ساباتلار(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "چەكلەنگەن ئالاقەداشلار(_B)"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Compact Size"
-msgstr "ئىخچام چوڭلۇق(_C)"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "مايىللىق(_R)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "سازلا(_D)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ئالاقەداشلاردىن ئىزدە(_L)"
 
-#: ../src/empathy-main-window.ui.h:21
-msgid "_File Transfers"
-msgstr "ھۆججەت ئەۋەتىش(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "ئاتى بويىچە تەرتىپلە(_N)"
 
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Join…"
-msgstr "قاتنىشىش(_J)…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "ھالىتى بويىچە تەرتىپلە(_S)"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "ي�ڭى سۆھبەت(_N)…"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "باش سۈرەت ۋە نورمال چوڭلۇق"
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Offline Contacts"
-msgstr "توردا يوق ئالاقەداشلار(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "نورمال چوڭلۇق(_O)"
 
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Personal Information"
-msgstr "شەخسىي ئۇچۇر(_P)"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "ئىخچام چوڭلۇق(_C)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "ئۆي(_R)"
 
-#: ../src/empathy-main-window.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "ئالاقەداش ئىزدەش(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "قاتنىشىش(_J)…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "يىغقۇچقا قوش(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "يىغقۇچ باشقۇرۇش"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "سۆھبەتخانا"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ئەزالار"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
-msgstr ""
-"%s\n"
+msgstr "%s\n"
 "تەكلىپ قىلىش زۆرۈر: %s\n"
 "ئىم زۆرۈر: %s\n"
 "ئەزالار: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ياق"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ئۆي تىزىمىنى قۇرۇشنى باشلىغىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ئۆي تىزىمىنى قۇرۇشنى توختاتقىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ئۆي تىزىمىنى ئوقۇغىلى بولمىدى"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ئۆيگە كىرىش"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"كىرمەكچى بولغان ئۆينىڭ ئاتىنى بۇ يەرگە كىرگۈزۈڭ ياكى تىزىمدىكى بىر ياكى "
-"بىرنەچچە ئۆينى چ�كىڭ."
+msgstr "كىرمەكچى بولغان ئۆينىڭ ئاتىنى بۇ يەرگە كىرگۈزۈڭ ياكى تىزىمدىكى بىر ياكى بىرنەچچە ئۆينى چ�كىڭ."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ئۆي(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr ""
-"ئۆيلەرگە ساھىبخانىلىق قىلىۋاتقان مۇلازىم�تىرنى كىرگۈزۈڭ ياكى ئۆيگە ھازىرقى "
-"مۇلازىم�تىر ساھىبخانىلىق قىلىۋاتقان بولسا بوش قويۇڭ."
+msgstr "ئۆيلەرگە ساھىبخانىلىق قىلىۋاتقان مۇلازىم�تىرنى كىرگۈزۈڭ ياكى ئۆيگە ھازىرقى مۇلازىم�تىر ساھىبخانىلىق قىلىۋاتقان بولسا بوش قويۇڭ."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ئۆيگە كىرىش"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ئۆي تىزىمىنى ئوقۇغىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ئۆي تىزىمى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ئۆي(_R):"
-
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "ئۇچۇر كەلدى"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "ئۇچۇر يوللاندى"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "ي�ڭى سۆھبەت"
 
-#: ../src/empathy-preferences.c:159
-msgid "Contact goes online"
-msgstr "ئالاقەداش توردا"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr ""
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ئالاقەداش توردا يوق"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "ھ�سابات باغلانغان"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "ھ�سابات ئۈزۈلگەن"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "تىل"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr ""
+msgstr "Juliet ئۈزۈلدى"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "قىياپەت"
+msgid "Show _smileys as images"
+msgstr "چىراي ئىپادىلىرىنى سۈرەت شەكلىدە كۆرسەت(_S)"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "ھەرىكەت"
+msgid "Show contact _list in rooms"
+msgstr "ئۆيدىكى ئالاقەداشلار تىزىمىنى كۆرسەت(_L)"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "سۆھبەت ئۇسلۇبى(_E):"
+msgid "Appearance"
+msgstr "قىياپەت"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئۇقتۇرۇش قىلمىسۇن"
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئاۋاز چىقارمىسۇن(_A)"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "كەلگەن ھادىسىلەرنى ئۇقتۇرۇش رايونىدا كۆرسەت"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "ئالاقەداش كىرگەندە ئۇقتۇرۇش قىلسۇن"
+msgid "Display incoming events in the notification area"
+msgstr "كەلگەن ھادىسىلەرنى ئۇقتۇرۇش رايونىدا كۆرسەت"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "ئالاقەداش ئايرىلغاندا ئۇقتۇرۇش قىلسۇن"
+msgid "_Automatically connect on startup"
+msgstr "قوزغالغاندا ئاپتوماتىك باغلان(_A)"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "سۆھبەت �وكۇسلانمىغاندىمۇ ئۇقتۇرۇش قىلسۇن(_C)"
+msgid "Log conversations"
+msgstr "سۆھبەتنى خاتىرىلەش"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "بۇ تىلغا نىسبەتەن ئىملا تەكشۈرۈشنى قوزغات:"
+msgid "Behavior"
+msgstr "ھەرىكەت"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "ئادەتتىكى"
 
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "سەكرىمە ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "ئورۇن مەنبەلىرى:"
+msgid "Disable notifications when _away or busy"
+msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئۇقتۇرۇش قىلمىسۇن"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "سۆھبەتنى خاتىرىلەش"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "سۆھبەت �وكۇسلانمىغاندىمۇ ئۇقتۇرۇش قىلسۇن(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Notifications"
-msgstr "ئۇقتۇرۇشلار"
+msgid "Enable notifications when a contact comes online"
+msgstr "ئالاقەداش كىرگەندە ئۇقتۇرۇش قىلسۇن"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Play sound for events"
-msgstr "ھادىسە يۈز بەرگەندە ئاۋاز قوي"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ئالاقەداش ئايرىلغاندا ئۇقتۇرۇش قىلسۇن"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "شەخسىي سىر"
+msgid "Notifications"
+msgstr "ئۇقتۇرۇشلار"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"ئورۇننىڭ توغرىلىقنى تۆۋەنلىتىش د�گەنلىك، شەھەر، ئۆلكە ۋە دۆلەتنىڭ ئورۇن "
-"ئۇچۇرلىرىنىڭ توغرىلىقىنى تۆۋەنلىتىش د�گەنلىكتۇر. GPS كوئورد�ناتلىرى ئونلۇق "
-"كەسىر چ�كىتىنىڭ بىرلەر خانىسىگىچە توغرىدۇر."
+msgid "_Enable sound notifications"
+msgstr "ئاۋازلىق ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "چىراي ئىپادىلىرىنى سۈرەت شەكلىدە كۆرسەت(_S)"
+msgid "Disable sounds when _away or busy"
+msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئاۋاز چىقارمىسۇن(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "ئۆيدىكى ئالاقەداشلار تىزىمىنى كۆرسەت(_L)"
+msgid "Play sound for events"
+msgstr "ھادىسە يۈز بەرگەندە ئاۋاز قوي"
 
 #: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "ئۈن"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "ئىملا تەكشۈرۈش"
+msgid "Use _echo cancellation to improve call quality"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "تىل تىزىمى سىز ئورناتقان لۇغەتنىڭ تىزىمىنى ئەكس ئەتتۈرۈپ ب�رىدۇ."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "باش ت�ما"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Variant:"
-msgstr "شالغۇت:"
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr "ئەكس سادانى ئاجىزلىتىش ئىقتىدارى ئىشلىتىلسە، ئاۋازىڭىز باشقىلارغا سۈزۈك ئاڭلىنىدۇ. بىراق بىر قىسىم كومپيۇت�رلاردا بەزى مەسىلىلەرمۇ ك�لىپ چىقىدۇ. ئەگەر سۆزلىشىش جەريانىدا غەلىتە ئاۋازلارنى ۋە باشقا نورمالسىزلىق بايقالسا، ئەكس سادانى ئاجىزلىتىش ئىقتىدارىنى ئىناۋەتسىز قىلىپ، سۆزلىشىشنى قايتا باشلاپ كۆرسە بولىدۇ."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "_Automatically connect on startup"
-msgstr "قوزغالغاندا ئاپتوماتىك باغلان(_A)"
+msgid "_Publish location to my contacts"
+msgstr "ئالاقەداشلىرىمغا ئورۇننى ئ�لان ئاشكارا قىل(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "_Cellphone"
-msgstr "يان�ون(_C)"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable bubble notifications"
-msgstr "سەكرىمە ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr "ئورۇننىڭ توغرىلىقنى تۆۋەنلىتىش د�گەنلىك، شەھەر، ئۆلكە ۋە دۆلەتنىڭ ئورۇن ئۇچۇرلىرىنىڭ توغرىلىقىنى تۆۋەنلىتىش د�گەنلىكتۇر. GPS كوئورد�ناتلىرى ئونلۇق كەسىر چ�كىتىنىڭ بىرلەر خانىسىگىچە توغرىدۇر."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "_Enable sound notifications"
-msgstr "ئاۋازلىق ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+msgid "_Reduce location accuracy"
+msgstr "ئورۇننىڭ توغرىلىقىنى تۆۋەنلەت(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "شەخسىي سىر"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "يان�ون(_C)"
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "تور(IP، Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Open new chats in separate windows"
-msgstr "ي�ڭى سۆھبەتنى باشقا كۆزنەكتە باشلا(_O)"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "ئورۇن مەنبەلىرى:"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Publish location to my contacts"
-msgstr "ئالاقەداشلىرىمغا ئورۇننى ئ�لان ئاشكارا قىل(_P)"
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "تىل تىزىمى سىز ئورناتقان لۇغەتنىڭ تىزىمىنى ئەكس ئەتتۈرۈپ ب�رىدۇ."
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Reduce location accuracy"
-msgstr "ئورۇننىڭ توغرىلىقىنى تۆۋەنلەت(_R)"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "بۇ تىلغا نىسبەتەن ئىملا تەكشۈرۈشنى قوزغات:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "ئىملا تەكشۈرۈش"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "سۆھبەت ئۇسلۇبى(_E):"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "شالغۇت:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "باش ت�ما"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "ھالىتى"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "چ�كىن(_Q)"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "باغلىنىش خەرىتە كۆرۈنۈشى"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "ساقلا"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "سازلاش كۆزنىكى"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "ۋاقىتلىق توختا"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "دەرىجە "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "سازلا"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
-msgstr "ئۇچۇر"
+msgstr "ئۇچۇرى"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
-msgstr "ئۇچۇر"
+msgstr "ئۇچۇرلار"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ئاچقۇچلۇق"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr "خاتالىق"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "ۋاقىت"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "دائىرە"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "كات�گورىيە"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "دەرىجە"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
-"تاللانغان باغلىنىش باشقۇرغۇچى يىراقتىكى سازلاش ك�ڭەيتىلمىسىنى قوللىمايدۇ"
+msgstr "تاللانغان باغلىنىش باشقۇرغۇچى يىراقتىكى سازلاش ك�ڭەيتىلمىسىنى قوللىمايدۇ"
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "قاتناشقۇچىلارنى تەكلىپ قىلىش"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "سۆھبەتكە تەكلىپ قىلىدىغان ئالاقەداشنى تاللاڭ:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "تەكلىپ"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"ھ�چقانداق سۆزلەشكۈ كۆرسەتمەي، مەشغۇلات(ئىمپورت قىلىش ...قاتارلىق)لارنى "
-"داۋاملاشتۇرۇپ ئاخىرلاشتۇرسۇن"
+msgstr "ھ�چقانداق سۆزلەشكۈ كۆرسەتمەي، مەشغۇلات(ئىمپورت قىلىش ...قاتارلىق)لارنى داۋاملاشتۇرۇپ ئاخىرلاشتۇرسۇن"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "«قوشنىلار» ھ�ساباتى بولمىغاندىلا ھ�چقانداق سۆزلەشكۈ كۆرسەتمىسۇن"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"ئەڭ دەسلەپتە ب�رىلگەن ھ�ساباتنى تاللاڭ(مەسىلەن، gabble/jabber/"
-"foo_40example_2eorg0)"
+msgstr "ئەڭ دەسلەپتە ب�رىلگەن ھ�ساباتنى تاللاڭ(مەسىلەن، gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ھ�سابات كىملىكى>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy ھ�ساباتلىرى"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy ھ�ساباتلىرى"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "بىرەر مۇلازىمەتنى كۆرسىتىدۇ"
+
+#: ../src/empathy-debugger.c:74
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- Empathy سازلىغۇچى"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy سازلىغۇچ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy سۆھبەت خ�رىدارى"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "ئىنكاس"
 
-#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "رەت قىل"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "جاۋاب"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
-msgstr " سىنلىق جاۋاب"
+msgstr "سىنلىق جاۋاب"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "قوشۇلما"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "قوشۇل"
 
-#: ../src/empathy-notifications-approver.c:260
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:239
 msgid "Provide"
 msgstr "تەمىنلە"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s سىزنى چاقىرغان ئىدى، بىراق سىز باشقىلار بىلەن سۆزلىشىۋاتقان."
 
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
+msgid "i"
+msgstr "i"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
 #, c-format
-msgid "Call with %d participants"
-msgstr "%d كىشى بىلەن سۆزلەش"
+msgid "Call with %s"
+msgstr "%s بىلەن سۆزلىشىش"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "كومپيۇت�ردا ئۇچرىغان IP ئادر�سى"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "ئىنت�رن�تتىكى مۇلازىم�تىردا ئۇچرىغان IP ئادر�سى"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "قارشى تەرەپتە ئۇچرىغان تەڭتۇش(peer)  IP ئادر�سى"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "ئۇلاپ تارقىتىش مۇلازىم�تىرىنىڭ IP ئادر�سى"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "كۆپ ئادر�سلىق خەۋەرلىشىش گۇرۇپپىسىنىڭ IP ئادر�سى"
+
+#: ../src/empathy-call-window.c:2886
+msgid "On hold"
+msgstr "كۈتۈپ تۇر"
+
+#: ../src/empathy-call-window.c:2889
+msgid "Mute"
+msgstr "ئۈنسىز"
+
+#: ../src/empathy-call-window.c:2891
+#| msgid "Location"
+msgid "Duration"
+msgstr "ۋاقتى"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:2894
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr "كۈتۈپ تۇر"
+#: ../src/empathy-call-window.c:2990
+msgid "Technical Details"
+msgstr "ت�خنىكىلىق تەپسىلات"
+
+#: ../src/empathy-call-window.c:3029
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s's يۇمشاق د�تالى كومپيۇت�رىڭىزدا بار بولغان ھ�چقانداق ئۈن �ورماتىنى تونۇمىدى."
+
+#: ../src/empathy-call-window.c:3034
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s's يۇمشاق د�تالى كومپيۇت�رىڭىزدا بار بولغان ھ�چقانداق سىن �ورماتىنى تونۇمىدى."
+
+#: ../src/empathy-call-window.c:3040
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr "%s نىڭ بىلەن باغلىنىش قۇرالمىدى. سىزنىڭ ياكى قارىشى تەرەپنىڭ بىۋاسىتە باغلىنىشقا رۇخسەت قىلىنمىغان بولۇشى مۇمكىن."
+
+#: ../src/empathy-call-window.c:3046
+msgid "There was a failure on the network"
+msgstr "توردا خاتالىق يۈز بەردى"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان ئۈن �ورماتلىرى كومپيۇت�رغا ئورنىتىلماپتۇ"
+
+#: ../src/empathy-call-window.c:3053
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان سىن �ورماتلىرى كومپيۇت�رغا ئورنىتىلماپتۇ"
+
+#: ../src/empathy-call-window.c:3065
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr "Telepathy بۆلىكىدە غەلىتىلىك يۈز بەردى. «ياردەم» تىزىملىكىدىكى «سازلاش» كۆزنىكىدە خاتىرىلىگەن ئۇچۇرلار بىلەن قوشۇپ <a href=\"%s\">بۇ كەمتۈكنى مەلۇم قىلىڭ</a>."
+
+#: ../src/empathy-call-window.c:3074
+msgid "There was a failure in the call engine"
+msgstr "چاقىرىش ماتورىدا خاتالىق يۈز بەردى"
+
+#: ../src/empathy-call-window.c:3077
+msgid "The end of the stream was reached"
+msgstr "ئ�قىم ئاخىرلاشتى"
+
+#: ../src/empathy-call-window.c:3117
+msgid "Can't establish audio stream"
+msgstr "ئۈن ئ�قىمىنى قۇرغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../src/empathy-call-window.c:3127
+msgid "Can't establish video stream"
+msgstr "سىن ئ�قىمىنى قۇرغىلى بولمىدى"
+
+#: ../src/empathy-call-window.c:3164
+#, c-format
+msgid "Your current balance is %s."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3168
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3170
+msgid "Top Up"
+msgstr ""
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy ئۈن/سىن خ�رىدار پروگراممىسى"
+
+#: ../src/empathy-call.c:224
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy ئۈن/سىن خ�رىدار پروگراممىسى"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "چوڭ كىچىك ھەرپنى پەرقلەندۈر(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "قانداق تىپتىكى ھ�ساباتىڭىز بار؟"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "قوشنا"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "butterfly خاتىرىلىرىنى يۆتكىدى."
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "butterfly خاتىرىسىنى يۆتكىدىمۇ يوق."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "سوك�ت تىپىنى ئىشلەتكىلى بولمايدۇ"
+
+#~ msgid "The account %s is edited via My Web Accounts."
+#~ msgstr "ھ�سابات %s نى تور ھ�ساباتىم ئارقىلىق تەھرىرلىگىلى بولمىدى."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "ھ�سابات %s نى Empathy دە تەھرىرلىگىلى بولمىدى."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "تور ھ�ساباتىمنى ئاچ"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "ۋاز كەچ(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "شەخسىي ئۇچۇرلارنى"
+
+#~ msgid "Ungrouped"
+#~ msgstr "گۇرۇپپىلانمىغان"
+
+#~ msgid "Favorite People"
+#~ msgstr "ئامراق ئادەملەر"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "تەھرىر(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ئالاقەداش تاللايدۇ"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "ئۇلانغان ئالاقەداشلار"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "ئۇلايدىغان ئالاقەداشنى تاللاش"
+
+#~ msgid "New contact preview"
+#~ msgstr "ي�ڭى ئالاقەداشنى ئالدىن كۆرۈش"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "تىزىمدا تاللانغان ئالاقەداشلار ئوز-ئارا ئۇلىنىدۇ."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ئالاقەداشلارنى ئۇلاش(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ئالاقەداشلارنى ئۇلاش"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ئۈزۈش(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "كۆرسىتىلگەن ئۇلانغان ئالاقەداشلارنى ئۇلانمىغان، ئايرىم-ئايرىم ئالاقەداشقا "
+#~ "پارچىلايدۇ."
+
+#~ msgid "_Link"
+#~ msgstr "ئۇلانما(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ئۇلانغان ئالاقەداش «%s» نى ئۈزسۇنمۇ؟"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ئۇلانغان ئالاقەداشلارنى راستلا ئۈزەمسىز؟ بۇنداقتا ئۇلانغان باشقا بارلىق "
+#~ "ئالاقەداشلار ئايرىم-ئايرىم ئالاقەداشقا ئايلىنىپ ك�تىدۇ."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ئۈز(_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ئالاقەداش كىملىكى:"
+
+#~ msgid "C_hat"
+#~ msgstr "سۆھبەت(_H)"
+
+#~ msgid "C_all"
+#~ msgstr "چاقىر(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "سىزنىڭ ھازىرقى ھالىتىڭىزنى ب�كىتىدۇ"
+
+#~ msgid "Find Next"
+#~ msgstr "ك�يىنكىنى ئىزدە"
+
+#~ msgid "Find Previous"
+#~ msgstr "ك�يىنكىنى ئىزدە"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "ئىختىيارى ئۇچۇر كىرگۈزۈش"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "ي�ڭى ھالەت ئۇچۇرىنى ساقلا(_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "ساقلانغان ھالەت ئۇچۇرى"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "تاللانغان ئالاقەداش ھۆججەتنى تاپشۇرۇپ ئالالمايدۇ."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "تاللانغان ئالاقەداش توردا يوق."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ھ�ساباتنى ئىمپورت قىلىۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "ھ�سابات تەپسىلاتىنى تەھلىل قىلىۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "ھ�سابات قۇرۇۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error."
+#~ msgstr "خاتالىق كۆرۈلدى."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "خاتالىق ئۇچۇرى: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "سىز كەينىگە قايتىپ ھ�سابات قايتا تەپسىلاتىنى كىرگۈزسىڭىز ياكى بۇ "
+#~ "ياردەمچىنى ئاخىرلاشتۇرۇپ، ك�يىن «تەھرىر» تىزىملىكى ئارقىلىق ھ�سابات "
+#~ "قوشسىڭىز بولىدۇ."
+
+#~ msgid "An error occurred"
+#~ msgstr "خاتالىق كۆرۈلدى"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "يەنە باشقا تەڭشىمەكچى بولغان سۆھبەت ھ�ساباتىڭىز بارمۇ؟"
+
+#~ msgid "Enter your account details"
+#~ msgstr "ھ�ساباتىڭىزنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "قانداق تىپتىكى ھ�سابات قۇرغۇڭىز بار؟"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "باشقا مۇڭداشقۇ ھ�ساباتى قۇرغۇڭىز بارمۇ؟"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "ي�ڭى ھ�ساباتنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy ئىشلىتىپ سىز توردىكى قوشنىلىرىڭىز ۋە Google سۆھبەت، AIM، Windows "
+#~ "Live ۋە باشقا سۆھبەت پروگراممىلىرىنى ئىشلىتىدىغان دوست، ساۋاقداشلىرىڭىز "
+#~ "بىلەن مۇڭدىشالايسىز. مىكرو�ون ۋە تور كام�راسى بولسا ئاۋازلىق ۋە سىنلىق "
+#~ "مۇڭداشقىلىمۇ بولىدۇ."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "باشقا مۇڭداشقۇلاردا ئىشلەتكەن ھ�ساباتىڭىز بارمۇ؟"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ھەئە، ھ�ساباتىمنىڭ تەپسىلاتىنى ئىمپورت قىلىمەن "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ھەئە، ھ�ساباتىمغا ئائىت تەپسىلاتلارنى كىرگۈزىمەن"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ياق، ي�ڭى ھ�سابات قۇرغۇم بار"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ياق، م�نىڭ ي�قىندىكى كىشىلەرنى ھازىرلا كۆرگۈم بار"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ئىمپورت قىلماقچى بولغان ھ�ساباتلارنى تاللاڭ:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ياق، ھازىرچە مۇشۇلارلا"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "تەھرىر->ھ�ساباتلار"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "بۇ ئىقتىدارنى ھازىرلا ئىناۋەتلىك قىلغۇم يوق(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ئەگەر telepathy-salut ئورنىتىلمىغان بولسا سىز يەرلىك توردىكى باشقىلار "
+#~ "بىلەن سۆھبەتلىشەلمەيسىز. بۇ ئىقتىدارنى ئىشلەتمەكچى بولسىڭىز telepathy-"
+#~ "salut بوغچىسىنى ئورنىتىڭ ۋە «ھ�سابات» سۆزلەشكۈسىنى ئىشلىتىپ بىر دانە "
+#~ "«قوشنىلار» ھ�ساباتىدىن بىرنى قۇرۇڭ."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "ئۇچۇر ۋە VoIP ھ�ساباتلىرى ياردەمچىسى"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Empathy غا مەرھابا"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ئۆزىڭىزنىڭ ھ�ساباتلىرىنى ئىمپورت قىلىدۇ"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "ي�ڭى ھ�سابات قۇرماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+#~ "ئۆزگىرىشلەر يوق بولۇپ ك�تىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
+
+#~ msgid "Protocol:"
+#~ msgstr "ك�لىشىم:"
+
+#~ msgid "Contrast"
+#~ msgstr "ئاق-قارىلىقى"
+
+#~ msgid "Brightness"
+#~ msgstr "يورۇقلۇق"
+
+#~ msgid "Gamma"
+#~ msgstr "گامما"
+
+#~ msgid "Volume"
+#~ msgstr "دىسكا"
+
+#~ msgid "_Sidebar"
+#~ msgstr "يان بالداق(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ئۈن كىرگۈزۈش"
+
+#~ msgid "Video input"
+#~ msgstr "سىن كىرگۈزۈش"
+
+#~ msgid "Details"
+#~ msgstr "تەپسىلاتى"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "باغلاندى — %d:%02dm"
+
+#~ msgid "Call the contact again"
+#~ msgstr "ئالاقەداشنى قايتا چاقىرىش"
+
+#~ msgid "Camera Off"
+#~ msgstr "كام�را ئ�تىك"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "كام�رانى ئىناۋەتسىز قىلىپ سىن يوللاشنى توختىتىدۇ"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "كام�رانى قوزغىتىپ سىن يوللا"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "كام�رانى قوزغات بىراق سىننى يوللىما"
+
+#~ msgid "Preview"
+#~ msgstr "ئالدىن كۆزەت"
+
+#~ msgid "Redial"
+#~ msgstr "قايتا چاقىرىش"
+
+#~ msgid "V_ideo"
+#~ msgstr "سىن(_I)"
+
+#~ msgid "Video Off"
+#~ msgstr "سىن ئ�تىك"
+
+#~ msgid "Video On"
+#~ msgstr "سىن ئوچۇق"
+
+#~ msgid "Video Preview"
+#~ msgstr "سىننى ئالدىن كۆزىتىش"
+
+#~ msgid "_Dialpad"
+#~ msgstr "نومۇر تاختىسى(_D)"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ھ�ساباتلارنى كۆرسىتىدۇ ۋە تەھرىرلەيدۇ"
+
+#~ msgid "_Personal Information"
+#~ msgstr "شەخسىي ئۇچۇر(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ي�ڭى سۆھبەتنى باشقا كۆزنەكتە باشلا(_O)"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "%d كىشى بىلەن سۆزلەش"
+
 #~ msgid "All"
 #~ msgstr "ھەممىسى"
 
diff --git a/po/uk.po b/po/uk.po
index b16c3ce39..c50c9216e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,13 +4,13 @@
 # Sergiy Dolgopolov <virgo@gnome.org.ua>, 2004.
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2008
 # Sergey Panasenko <nitay@users.sourceforge.net>, 2009.
-# Korostil Daniel <ted.korostiled@gmail.com>, 2011.
+# Korostil Daniel <ted.korostiled@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-11 16:53+0200\n"
-"PO-Revision-Date: 2011-12-11 20:56+0300\n"
+"POT-Creation-Date: 2012-03-08 14:27+0200\n"
+"PO-Revision-Date: 2012-03-08 21:37+0300\n"
 "Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
 "Language: uk\n"
@@ -19,447 +19,463 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Балачки через Google Talk, Facebook, MSN та багато інших �лужб "
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Миттєві повідомленн�"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Обмін повідомленн�ми Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Миттєві повідомленн�"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Балачки через Google Talk, Facebook, MSN та багато інших �лужб "
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Ли�туванн� й облікові запи�и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Керуванн� обліковими запи�ами повідомлень та VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Завжди відкривати нову бе�іду у новому вікні."
+msgid "Connection managers should be used"
+msgstr "�е �лід викори�товувати менеджери з'єднань"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "При�трій камери"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Чи викори�товувати менеджер з'єднань дл� автоматичного в�тановленн�/"
+"розриванн� зв'�зку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Положенн� камери"
+msgid "Empathy should auto-connect on startup"
+msgstr "З'єднувати�� під ча� запу�ку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ дл� додаванн� пі�л� п�евдоніму, �кщо у бе�іді викори�товуєть�� "
-"автоматичне доповненн� п�евдонімів клавішею Tab."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "�втоматично з'єднувати облікові запи�и при запу�ку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Тема вікна бе�іди"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy �лід автоматично переходити в режим очікуванн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Варіант теми вікна бе�іди"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Чи �лід іти в режим очікуванн�, коли кори�тувач безді�льний."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Спи�ок мов, що викори�товують�� при перевір�нні орфографії, розділених "
-"комами (наприклад, «en, ru, uk»)."
+msgid "Empathy default download folder"
+msgstr "Типова тека дл� звантаженн� файлів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Щільний �пи�ок контактів"
+msgid "The default folder to save file transfers in."
+msgstr "Типова тека дл� збереженн� вхідних файлів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "�е �лід викори�товувати менеджери з'єднань"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Магічне чи�ло дл� перевір�нн�, коли варто запу�тити завданн� зі зваженого "
+"очищенн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Критерій упор�дкуванн� �пи�ку контактів"
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c викори�товує це чи�ло дл� перевір�нн�, чи варто "
+"виконувати завданн� з очищенн�, чи ні. Кори�тувачам не �лід змінювати цей "
+"ключ вручну."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Контур об'єкта D-Bus о�таннього облікового запи�у, �кий вибрано дл� "
-"приєднанн� до кімнати."
+msgid "Show offline contacts"
+msgstr "Показувати від�утні контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Типовий при�трій камери дл� відеовикликів, наприклад, /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Чи показувати недо�тупних у мережі кори�тувачів у �пи�ку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Каталог, що викори�товуєть�� дл� вибору зображень аватарів"
+msgid "Show avatars"
+msgstr "Показувати аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Вимкнути контек�тні �повіщенн� у �тані «відійшов»"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Чи показувати аватари дл� контактів у �пи�ку та вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Вимкнути звуки у �тані «відійшов»"
+msgid "Show protocols"
+msgstr "Показати протокол:"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Показувати вхідні події в діл�нці �тану"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Чи показувати аватари дл� контактів у �пи�ку та вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показувати вхідні події в діл�нці �тану. Якщо ні, то пред�тавити їх "
-"кори�тувачу негайно."
+msgid "Show Balance in contact list"
+msgstr "Показувати залишок у �пи�ку контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Підтримуванн� у�уненн� відлунн�"
+msgid "Whether to show account balances in the contact list."
+msgstr "Чи показувати залишок облікових запи�ів у �пи�ку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy може публікувати мі�цеві�ть кори�тувачів"
+msgid "Compact contact list"
+msgstr "Щільний �пи�ок контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy може викори�товувати GPS дл� визначенн� мі�цево�ті."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Чи показувати �пи�ок контактів �ти�неним."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy може викори�товувати �тільникову мережу дл� визначенн�  мі�цево�ті"
+msgid "Hide main window"
+msgstr "Сховати головне вікно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy може викори�товувати  мережу дл� припущень щодо мі�цево�ті"
+msgid "Hide the main window."
+msgstr "Сховати головне вікно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Типова тека дл� звантаженн� файлів"
+msgid "Default directory to select an avatar image from"
+msgstr "Каталог, що викори�товуєть�� дл� вибору зображень аватарів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy �лід автоматично переходити в режим очікуванн�"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "О�танній каталог, з �кого брали�ь зображенн� аватарів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "З'єднувати�� під ча� запу�ку"
+msgid "Open new chats in separate windows"
+msgstr "Відкривати нові бе�іди у новому вікні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy має по�лабити точні�ть визначенн� мі�цево�ті"
+msgid "Always open a separate chat window for new chats."
+msgstr "Завжди відкривати нову бе�іду у новому вікні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy має викори�товувати аватар контакту, �к піктограму вікна із бе�ідою"
+msgid "Display incoming events in the status area"
+msgstr "Показувати вхідні події в діл�нці �тану"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Увімкнути за�іб розробленн� WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Показувати вхідні події в діл�нці �тану. Якщо ні, то пред�тавити їх "
+"кори�тувачу негайно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Ввімкнути контек�тні �повіщенн� дл� нових повідомлень"
+msgid "The position for the chat window side pane"
+msgstr "Позиці� бокової панелі вікна балачки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Увімкнути перевір�нн� орфографії"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Збережена позиці� (в пік�ел�х) бокової панелі вікна балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Сховати головне вікно"
+msgid "Show contact groups"
+msgstr "Показати групу контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Сховати головне вікно."
+msgid "Whether to show groups in the contact list."
+msgstr "Чи показувати групи у �пи�ку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "О�танній обліковий запи�, вибраний у вікні приєднанн� до кімнати"
+msgid "Contact list sort criterion"
+msgstr "Критерій упор�дкуванн� �пи�ку контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Символ автоматичне доповненн� п�евдоніму"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Критерій дл� впор�дковуванн� �пи�ку контактів. Типово впор�дковуєть�� за "
+"�таном контакту зі значенн� «state». Значенн� «name» впор�дкує �пи�ок "
+"контактів за їхньою назвою."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Відкривати нові бе�іди у новому вікні"
+msgid "Use notification sounds"
+msgstr "Викори�товувати звуки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Шл�х до теми Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Чи відтворювати звукові �игнали при поді�х."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Шл�х до теми Adium дл� викори�танн� у балачці Adium."
+msgid "Disable sounds when away"
+msgstr "Вимкнути звуки у �тані «відійшов»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Відтворити звук при отриманні повідомленн�"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Чи відтворювати звукові �игнали у �танах «відійшов» або «зайн�тий»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Відтворити звук дл� нової розмови"
+msgid "Play a sound for incoming messages"
+msgstr "Відтворити звук при отриманні повідомленн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Відтворити звук при відправленні повідомленн�"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Чи відтворювати звуковий �игнал при надходженні повідомленн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Відтворити звук при по�ві контакту в мережі"
+msgid "Play a sound for outgoing messages"
+msgstr "Відтворити звук при відправленні повідомленн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Відтворити звук при від'єднанні контакту"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Чи відтворювати звуковий �игнал при над�иланні повідомленн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Відтворити звук при вході"
+msgid "Play a sound for new conversations"
+msgstr "Відтворити звук дл� нової розмови"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Відтворити звук при виході"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Чи відтворювати звуковий �игнал дл� нової бе�іди."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Контек�тні �повіщенн�, коли балачка не в фоку�і"
+msgid "Play a sound when a contact logs in"
+msgstr "Відтворити звук при по�ві контакту в мережі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Контек�тні �повіщенн�, коли контакт увійде"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Чи відтворювати звуковий �игнал при вході контакту в мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Контек�тні �повіщенн�, коли контакт вийде"
+msgid "Play a sound when a contact logs out"
+msgstr "Відтворити звук при від'єднанні контакту"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Перегл�д положенн� потрібно здій�нювати прот�гом дзвінка."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Чи відтворювати звуковий �игнал при виході контакту з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Показувати залишок у �пи�ку контактів"
+msgid "Play a sound when we log in"
+msgstr "Відтворити звук при вході"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Показувати аватари"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Чи відтворювати звуковий �игнал при вході у мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Показати �пи�ок контактів у кімнаті"
+msgid "Play a sound when we log out"
+msgstr "Відтворити звук при виході"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Показувати підтвердженн� про закритт� головного вікна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Чи відтворювати звуковий �игнал при виході з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Показувати від�утні контакти"
+msgid "Enable popup notifications for new messages"
+msgstr "Ввімкнути контек�тні �повіщенн� дл� нових повідомлень"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Показати протокол:"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Чи показувати контек�тні �повіщенн� при надходженні нового повідомленн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Перевір�нн� правопи�у дл� мов"
+msgid "Disable popup notifications when away"
+msgstr "Вимкнути контек�тні �повіщенн� у �тані «відійшов»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Типова тека дл� збереженн� вхідних файлів."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Чи показувати контек�тні �повіщенн� у �танах «відійшов» або «зайн�тий»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "О�танній каталог, з �кого брали�ь зображенн� аватарів."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Контек�тні �повіщенн�, коли балачка не в фоку�і"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Позиці� бокової панелі вікна балачки"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Чи показувати контек�тні �повіщенн� при надходженні нового повідомленн�, "
+"коли балачку вже відкрито, але він не в фоку�і."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Збережена позиці� (в пік�ел�х) бокової панелі вікна балачки."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Контек�тні �повіщенн�, коли контакт увійде"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Ц� тема викори�товуєть�� дл� вікна бе�іди."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Чи показувати контек�тні �повіщенн� коли контакт входить у мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Варіант теми, �кий викори�товуєть�� дл� показу розмов у вікні балачки."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Контек�тні �повіщенн�, коли контакт вийде"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Викори�товувати графічні емоційки"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Чи показувати контек�тні �повіщенн� коли контакт виходить з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Викори�товувати звуки"
+msgid "Use graphical smileys"
+msgstr "Викори�товувати графічні емоційки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Викори�товувати тему дл� бе�ід"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Перетворювати тек�тові емоційки у графічні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Чи показувати мі�цево�ті вашим контактам."
+msgid "Show contact list in rooms"
+msgstr "Показати �пи�ок контактів у кімнаті"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Чи викори�товувати GPS дл� визначенн� мі�цево�ті."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Чи показувати �пи�ок контактів у кімнаті."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Чи викори�товувати мобільну мережу дл� визначенн� мі�цево�ті."
+msgid "Chat window theme"
+msgstr "Тема вікна бе�іди"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Чи викори�товувати комп'ютерну мережу дл� визначенн� мі�цево�ті."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Ц� тема викори�товуєть�� дл� вікна бе�іди."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "�втоматично з'єднувати облікові запи�и при запу�ку."
+msgid "Chat window theme variant"
+msgstr "Варіант теми вікна бе�іди"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Чи �лід іти в режим очікуванн�, коли кори�тувач безді�льний."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варіант теми, �кий викори�товуєть�� дл� показу розмов у вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Чи �лід зменшити точні�ть визначенн� мі�цево�ті задл� конфіденційно�ті."
+msgid "Path of the Adium theme to use"
+msgstr "Шл�х до теми Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Чи викори�товувати аватари контактів �к піктограми вікон із бе�ідами"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Шл�х до теми Adium дл� викори�танн� у балачці Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Чи вмикати такі за�оби розробленн� WebKit, �к Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Увімкнути за�іб розробленн� WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Чи викори�товувати менеджер з'єднань дл� автоматичного в�тановленн�/"
-"розриванн� зв'�зку."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Чи вмикати такі за�оби розробленн� WebKit, �к Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Перевір�ти набрані �лова за �пи�ком мов дл� перевір�нн� орфографії."
+msgid "Inform other users when you are typing to them"
+msgstr "Повідомл�ти інших кори�тувачів, коли ви друкуєте їм"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Перетворювати тек�тові емоційки у графічні."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Чи над�илати зміни �танів «�кладанн�» або «зупиненн�». �аразі не впливає на "
+"�тан «від�утній»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Чи ввімкнути фільтр у�уненн� відлунн� Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Викори�товувати тему дл� бе�ід"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Чи відтворювати звуковий �игнал при вході контакту в мережу."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Чи викори�товувати теми дл� вікон бе�ід."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Чи відтворювати звуковий �игнал при виході контакту з мережі."
+msgid "Spell checking languages"
+msgstr "Перевір�нн� правопи�у дл� мов"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Чи відтворювати звукові �игнали при поді�х."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спи�ок мов, що викори�товують�� при перевір�нні орфографії, розділених "
+"комами (наприклад, «en, ru, uk»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Чи відтворювати звуковий �игнал при надходженні повідомленн�."
+msgid "Enable spell checker"
+msgstr "Увімкнути перевір�нн� орфографії"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Чи відтворювати звуковий �игнал дл� нової бе�іди."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Перевір�ти набрані �лова за �пи�ком мов дл� перевір�нн� орфографії."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Чи відтворювати звуковий �игнал при над�иланні повідомленн�."
+msgid "Nick completed character"
+msgstr "Символ автоматичне доповненн� п�евдоніму"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Чи відтворювати звуковий �игнал при вході у мережу."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ дл� додаванн� пі�л� п�евдоніму, �кщо у бе�іді викори�товуєть�� "
+"автоматичне доповненн� п�евдонімів клавішею Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Чи відтворювати звуковий �игнал при виході з мережі."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy має викори�товувати аватар контакту, �к піктограму вікна із бе�ідою"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Чи відтворювати звукові �игнали у �танах «відійшов» або «зайн�тий»."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Чи викори�товувати аватари контактів �к піктограми вікон із бе�ідами"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Чи показувати контек�тні �повіщенн� коли контакт виходить з мережі."
+msgid "Last account selected in Join Room dialog"
+msgstr "О�танній обліковий запи�, вибраний у вікні приєднанн� до кімнати"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Чи показувати контек�тні �повіщенн� коли контакт входить у мережу."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Контур об'єкта D-Bus о�таннього облікового запи�у, �кий вибрано дл� "
+"приєднанн� до кімнати."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Чи показувати контек�тні �повіщенн� при надходженні нового повідомленн�, "
-"коли балачку вже відкрито, але він не в фоку�і."
+msgid "Camera device"
+msgstr "При�трій камери"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Чи показувати контек�тні �повіщенн� при надходженні нового повідомленн�."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Типовий при�трій камери дл� відеовикликів, наприклад, /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Чи показувати залишок облікових запи�ів у �пи�ку контактів."
+msgid "Camera position"
+msgstr "Положенн� камери"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Чи показувати аватари дл� контактів у �пи�ку та вікні балачки."
+msgid "Position the camera preview should be during a call."
+msgstr "Перегл�д положенн� потрібно здій�нювати прот�гом дзвінка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Чи показувати недо�тупних у мережі кори�тувачів у �пи�ку контактів."
+msgid "Echo cancellation support"
+msgstr "Підтримуванн� у�уненн� відлунн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Чи показувати контек�тні �повіщенн� у �танах «відійшов» або «зайн�тий»."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Чи ввімкнути фільтр у�уненн� відлунн� Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Чи показувати аватари дл� контактів у �пи�ку та вікні балачки."
+msgid "Show hint about closing the main window"
+msgstr "Показувати підтвердженн� про закритт� головного вікна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Чи показувати �пи�ок контактів у кімнаті."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Чи показувати �пи�ок контактів �ти�неним."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -467,75 +483,94 @@ msgstr ""
 "Чи показувати повідомленн� про закритт� головного вікна кнопкою «x» у "
 "заголовку."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy може публікувати мі�цеві�ть кори�тувачів"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Чи показувати мі�цево�ті вашим контактам."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Чи викори�товувати теми дл� вікон бе�ід."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy може викори�товувати  мережу дл� припущень щодо мі�цево�ті"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Чи викори�товувати комп'ютерну мережу дл� визначенн� мі�цево�ті."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
-"Критерій дл� впор�дковуванн� �пи�ку контактів. Типово впор�дковуєть�� за "
-"п�евдонімом контакту — «name». При значенні «state» �пи�ок буде впор�дковано "
-"за �таном."
+"Empathy може викори�товувати �тільникову мережу дл� визначенн�  мі�цево�ті"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Керуванн� обліковими запи�ами повідомлень та VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Чи викори�товувати мобільну мережу дл� визначенн� мі�цево�ті."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
-msgid "Messaging and VoIP Accounts"
-msgstr "Ли�туванн� й облікові запи�и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy може викори�товувати GPS дл� визначенн� мі�цево�ті."
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Чи викори�товувати GPS дл� визначенн� мі�цево�ті."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy має по�лабити точні�ть визначенн� мі�цево�ті"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Чи �лід зменшити точні�ть визначенн� мі�цево�ті задл� конфіденційно�ті."
+
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Причину не вказано"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Запит на заміну �тану"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Ви �ка�ували передачу файла "
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Інший уча�ник �ка�ував передаванн� файла"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Помилка при �пробі передати файл"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Інший уча�ник не може передати файл"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�евідома причина"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Передаванн� файла завершено, але файл пошкоджено"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Передача файлів не працює дл� віддалених контактів"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Вибраний файл не є звичайним файлом"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Вибраний файл порожній"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущений виклик від %s"
@@ -551,139 +586,139 @@ msgstr "Викликано %s"
 msgid "Call from %s"
 msgstr "Виклик від %s"
 
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "До�тупний"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зайн�тий"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Відійшов"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидимий"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Поза мережею"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�евідомо"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Причину не вказано"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "В�тановлено �тан «поза мережею»"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Помилка мережі"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�е вдало�ь аутентифікувати"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Помилка шифруванн�"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "П�евдонім уже викори�товуєть��"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертифікат недо�тупний"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертифікат ненадійний"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертифіката за�тарів"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертифікат не активовано"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Сертифікат з помилкою  у назві вузла"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Відбитки �ертифікатів не збігають��"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Самопідпи�аний �ертифікат"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Помилка �ертифіката"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифруванн� не до�тупне"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертифікат недій�ний"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "У з'єднанні відмовлено"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "З'єднанн� неможливо в�тановити"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "З'єднанн� втрачено"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Цей ре�ур� уже з'єднано з �ервером"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Цей обліковий запи� уже з'єднано з �ервером"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "З'єднанн� замінено на нове з'єднанн� через той �амий ре�ур�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Цей обліковий запи� уже і�нує на �ервері"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер зараз зайн�тий, щоб обробити з'єднанн�"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертифікат анульовано"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертифікат викори�товує небезпечний алгоритм шифруванн� або криптографічно "
 "ненадійний."
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -691,27 +726,31 @@ msgstr ""
 "Довжина �ертифіката �ервера або глибина ланцюжка �ертифіката �ервера "
 "перевищує обмеженн� криптографічної бібліотеки"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Ваша програма надто �тара"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Внутрішн� помилка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Люди поблизу"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Японі�"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Балачка Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -719,7 +758,7 @@ msgstr[0] "%d �екунду тому"
 msgstr[1] "%d �екунди тому"
 msgstr[2] "%d �екунд тому"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -727,7 +766,7 @@ msgstr[0] "%d хвилину тому"
 msgstr[1] "%d хвилини тому"
 msgstr[2] "%d хвилин тому"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -735,7 +774,7 @@ msgstr[0] "%d годину тому"
 msgstr[1] "%d години тому"
 msgstr[2] "%d годин тому"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -743,7 +782,7 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -751,7 +790,7 @@ msgstr[0] "%d тиждень тому"
 msgstr[1] "%d тижн� тому"
 msgstr[2] "%d тижнів тому"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -759,224 +798,196 @@ msgstr[0] "%d мі��ць тому"
 msgstr[1] "%d мі��ц� тому"
 msgstr[2] "%d мі��ців тому"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в майбутньому"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "У�і облікові запи�и"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Обліковий запи�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "Мої мережеві облікові запи�и "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Обліковий запи� %s змінено через %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Обліковий запи� %s неможливо редагувати в Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "Запу�тити мій обліковий запи� із �айту"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "Редагувати %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Кори�тувач:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_За�то�увати"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Увійти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Цей обліковий запи� вже і�нує на �ервері"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Створити новий обліковий запи� на �ервері"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "_Ска�увати"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Обліковий запи� %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�овий обліковий запи�"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Приклад:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Додатково"
+msgid "Screen _Name:"
+msgstr "_Екранний п�евдонім:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Приклад:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запам'�тати пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запам'�тати пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "П_орт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запам'�тати пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Екранний п�евдонім:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Пароль вашого AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Додатково"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Пароль облікового запи�у AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "П_орт:"
+msgid "What is your AIM password?"
+msgstr "Пароль вашого AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Приклад:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запам'�тати пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Ідентифікатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Приклад:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Ваш ідентифікатор кори�тувача GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Пароль вашого GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Приклад:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_�абір �имволів:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Ідентифікатор кори�тувача (UIN) у ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Пароль у ICQ?"
 
@@ -1013,11 +1024,23 @@ msgstr "Параметри"
 msgid "None"
 msgstr "�емає"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мережа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мережа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодуванн�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сервери"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1025,14 +1048,6 @@ msgstr ""
 "Більші�ть �ерверів IRC потребують пароль, отож, �кщо ви не впевнені, не "
 "вводьте пароль."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мережа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мережа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "П�евдонім:"
@@ -1049,48 +1064,20 @@ msgstr "Повідомленн� при виході:"
 msgid "Real name:"
 msgstr "Справжнє ім'�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сервери"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Який ваш п�евдонім у IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Яка мережа IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Приклад:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Приклад:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Шифруванн� обов'�зкове (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ігнорувати помилки �ертифікатів SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Замінювати параметри �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "П_ріоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Який ваш п�евдонім у IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ре_�ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Кори�тувач у Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1102,180 +1089,204 @@ msgstr ""
 "Викори�товуйте <a href=\"http://www.facebook.com/username/\">цю �торінку</a> "
 "дл� вибору кори�тувача Facebook, �кщо у ва� його немає."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Викори�товувати �таре _шифруванн� (SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Пароль у Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Кори�тувач у Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Ваш ідентифікатор у Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Приклад:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Пароль у Google"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Приклад:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ігнорувати помилки �ертифікатів SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "П_ріоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ре_�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Шифруванн� обов'�зкове (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Викори�товувати �таре _шифруванн� (SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Замінювати параметри �ервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Ідентифікатор Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Пароль у Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Бажаний ідентифікатор у Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Пароль у Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Бажаний пароль у Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Приклад:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Ідентифікатор у Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Пароль у Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_�дре�а електронної пошти:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "П_�евдонім:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Прізвище:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ім'�: "
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Публічне прізви�ько:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Прізвище:"
+msgid "E-_mail address:"
+msgstr "_�дре�а електронної пошти:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Публічне прізви�ько:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Кори�тувач:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Приклад:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Кори�тувач дл� аутентифікації:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Ви�вл�ти з'єднанн�"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Відкрийте дл� �ебе �ервер STUN автоматично"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Скори�тати�ь цим обліковим запи�ом дл� _�таціонарних і мобільних телефонів"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ігнорувати помилки TLS"
+msgid "NAT Traversal Options"
+msgstr "Параметри NAT Traversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Інтервал (у �екундах)"
+msgid "Proxy Options"
+msgstr "Параметри прок�і"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Параметри утримуванн� з'єднанн�"
+msgid "Miscellaneous Options"
+msgstr "Інші параметри"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Вільне маршрутизуванн�"
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механізм:"
+msgid "Discover the STUN server automatically"
+msgstr "Відкрийте дл� �ебе �ервер STUN автоматично"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Інші параметри"
+msgid "Discover Binding"
+msgstr "Ви�вл�ти з'єднанн�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Параметри NAT Traversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Параметри утримуванн� з'єднанн�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механізм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Параметри прок�і"
+msgid "Interval (seconds)"
+msgstr "Інтервал (у �екундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Кори�тувач дл� аутентифікації:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Loose Routing"
+msgstr "Вільне маршрутизуванн�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Ігнорувати помилки TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"Скори�тати�ь цим обліковим запи�ом дл� _�таціонарних і мобільних телефонів"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Пароль до облікового запи�у у SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Ідентифікатор облікового запи�у у SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Кори�тувач:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Пароль до облікового запи�у у SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ігнорувати запрошенн� до бе�ід у кімнатах та конференцій"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локаль �пи�ку бе�ід:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Ідентифікатор у Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Пароль у Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локаль �пи�ку бе�ід:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1313,88 +1324,88 @@ msgstr "У�і файли"
 msgid "Click to enlarge"
 msgstr "�ати�ніть дл� збільшенн�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Помилка виклику"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Вказаний контакт не підтримує виклики"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Вказаний контакт поза мережею"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Вказаний контакт недій�ний"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Ек�трені виклики не підтримують�� цим протоколом"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Ви не має до�татньо на рахунку, щоб здій�нити цей виклик"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "�е вдало�ь відкрити приватну кімнату"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Тема не підтримуєть�� у цій бе�іді"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "У ва� немає прав змінювати тему"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» — недій�ний ідентифікатор контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очи�тити в�і повідомленн� з поточної бе�іди"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: в�тановити тему поточної бе�іди"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: приєднати�� до нової кімнати розмов"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: приєднати�� до нової кімнати розмов"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<chat room ID>] [<reason>]: покинути кімнату бе�іди, типово теперішню"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: відкрити приватну бе�іду"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: відкрити приватну бе�іду"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: змінити назву на поточному �ервері"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: наді�лати повідомленн� ACTION до поточної бе�іди"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1404,11 +1415,11 @@ msgstr ""
 "дл� над�иланн� нового повідомленн�, що починаєть�� з '/'. �априклад: \"/"
 "�кажіть /join дл� приєднанн� до нової кімнати розмов\""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: показує інформацію про контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1416,121 +1427,127 @@ msgstr ""
 "/help [<command>]: показати довідку. Якщо визначено <command>, показати "
 "�интак�и� команди."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Викори�танн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "�евідома команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "�евідома команда; дл� виводу �пи�ку до�тупних команд введіть /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "недо�татній залишок дл� над�иланн� повідомленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Помилка при над�иланні повідомленн� «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Помилка над�иланн� повідомленн�: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "недо�татній залишок дл� над�иланн� повідомленн�. <a href='%s'>Поповнити</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "не здатен"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "поза мережею"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "неправильний контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "відмовлено у до�тупі"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "надто довге повідомленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "не реалізовано"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "невідомо"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s змінив тему на: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Тему не в�тановлено"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(�ема пропозицій)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додати «%s» до �ловника"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додати «%s» до �ловника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "В�тавити емоційку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_�аді�лати"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Пропозиції з правопи�у"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "�е вдало�ь одержати о�танні журнали"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s від'єднано"
@@ -1538,12 +1555,12 @@ msgstr "%s від'єднано"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s викинено кори�тувачем %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s викинено"
@@ -1551,17 +1568,17 @@ msgstr "%s викинено"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s заблоковано кори�тувачем %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s заблоковано"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинув кімнату"
@@ -1571,17 +1588,17 @@ msgstr "%s покинув кімнату"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s приєднав�� до бе�іди"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s тепер відомий �к %s"
@@ -1589,55 +1606,55 @@ msgstr "%s тепер відомий �к %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2847
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Від'єднаний"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Зберегти цей пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запам'�тати"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "�е зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Повторити"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "�еправильний пароль; введіть пароль ще раз:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Цю кімнату захищено паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Увійти"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "З'єднаний"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Розмова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1669,10 +1686,10 @@ msgstr "Редагувати заблоковані контакти"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Обліковий запи�:"
 
@@ -1682,7 +1699,7 @@ msgstr "Заблоковані контакти"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Вилучити"
@@ -1705,39 +1722,30 @@ msgstr "_Відкрити по�иланн�"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Редагувати інформацію про контакт"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "О�оби�та інформаці�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�овий контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокувати %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Блокувати «%s» з контактів знову?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "За_блокувати"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Звинуватити цей контакт в образі"
@@ -1745,83 +1753,16 @@ msgstr[1] "_Звинуватити ці контакти в образі"
 msgstr[2] "_Звинуватити ці контакти в образі"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Вирішити пізніше"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запит на підпи�ку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "За_блокувати кори�тувача"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:207
-#: ../libempathy-gtk/empathy-individual-menu.c:1559
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Додати контакт…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:282
-msgid "_Block Contact"
-msgstr "За_блокувати контакт"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:311
-#: ../libempathy-gtk/empathy-individual-menu.c:790
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Балачка"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:343
-#: ../libempathy-gtk/empathy-individual-menu.c:882
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_�удіовиклик"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:927
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Відеовиклик"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:422
-#: ../libempathy-gtk/empathy-individual-menu.c:980
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Попередні бе�іди"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:1021
-msgid "Send File"
-msgstr "�аді�лати файл"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:467
-#: ../libempathy-gtk/empathy-individual-menu.c:1063
-msgid "Share My Desktop"
-msgstr "Оприлюднити мою �тільницю"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../libempathy-gtk/empathy-individual-menu.c:1126
-msgid "Infor_mation"
-msgstr "Інфор_маці�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:536
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "З_міни"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:590
-#: ../libempathy-gtk/empathy-individual-menu.c:1317
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Запрошенн� до цієї кімнати"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:621
-#: ../libempathy-gtk/empathy-individual-menu.c:1363
-msgid "_Invite to Chat Room"
-msgstr "_Запро�ити до кімнати"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Вирішити пізніше"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1848,166 +1789,170 @@ msgstr "Повідомленн�, �ке пред�тавл�є ва�: "
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Будь ла�ка, повідомте мене, коли ви буде в мережі. Д�кую!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Код ISO країни:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Країна:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Регіон:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Мі�то:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Район:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Поштовий індек�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Вулиц�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Дім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Квартира:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Кімната:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "�дре�а (URI):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Рівень точно�ті:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Помилка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Вертикальна помилка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Горизонтальна помилка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Швидкі�ть:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "�зимут:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Швидкі�ть підйому:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "О�таннє оновленн� о:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Довгота:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Широта:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Ви�ота:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Мі�цеві�ть"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Зберегти аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�еможливо зберегти аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1098
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "Улюблений"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "О�оби�ті відомо�ті"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Подробиці про контакт"
 
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
@@ -2074,54 +2019,49 @@ msgstr "поштовий"
 msgid "parcel"
 msgstr "по�илковий"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Мі�цеві�ть</b> у (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Ідентифікатор:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�евдонім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Інформаці� про викори�тану програму"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Програма:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Мі�цеві�ть</b> у (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Подробиці про контакт"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Запит на інформацію…"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Ідентифікатор:"
+msgid "Client Information"
+msgstr "Інформаці� про викори�тану програму"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Запит на інформацію…"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�і�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Програма:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2129,127 +2069,172 @@ msgstr ""
 "Виберіть групи, у �ких має з'�вити�� контакт. Можна вибрати більше ніж одну "
 "групу або не вибирати зов�ім."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Додати групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Вибрати"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Такий ідентифікатор буде заблоковано:"
 msgstr[1] "Такі ідентифікатори буде заборонено:"
 msgstr[2] "Такі ідентифікатори буде заборонено:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Такий ідентифікатор неможливо заборонити:"
 msgstr[1] "Такі ідентифікатори неможливо заборонити:"
 msgstr[2] "Такі ідентифікатори неможливо заборонити:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Пов'�зані контакти"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Вибрати контакт дл� по�иланн�"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Перегл�д нового контакту"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Контакти вибрані в �пи�ку зліва буде �получено разом."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Редагувати інформацію про контакт"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:149
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Вибрати обліковий запи� дл� мі�ц� виклику"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:317
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Виклик"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:384
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Робота"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:386
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Дім"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "За_блокувати контакт"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Балачка"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:837
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1175
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_�удіовиклик"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Відеовиклик"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Попередні бе�іди"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "�аді�лати файл"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Оприлюднити мою �тільницю"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Улюблений"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не в�тановлено"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "В�тановіть gnome-contacts дл� одержанн� відомо�тей про контакт."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Інфор_маці�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1201
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Сполучити контакт…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Запрошенн� до цієї кімнати"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Запро�ити до кімнати"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Додати контакт…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Вилучити і за_блокувати"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вилучити групу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Вилученн� групи"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Вилучити контакт «%s» з вашого �пи�ку?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2258,11 +2243,11 @@ msgstr ""
 "Вилучити �получений контакт «%s»? Зауважте, це вилучить у�і контакти, �кі "
 "�кладають �пи�ок цього �полученого контакту."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Вилученн� контакту"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2274,23 +2259,23 @@ msgstr[2] "Сполучені контактів міÑ�Ñ‚Ñ�Ñ‚ÑŒ %u контакÑ
 msgid "<b>Location</b> at (date)"
 msgstr "<b>�дре�а</b> у (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "У мережі через телефон або мобільний при�трій"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова мережа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Виберіть мережу IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Скинути �пи�ок _мереж"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Вибрати"
@@ -2303,91 +2288,48 @@ msgstr "новий �ервер"
 msgid "SSL"
 msgstr "Шифруванн� SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Сполучити контакти"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Роз'єднати…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Повні�тю розділити показані �получені контакти в окремі контакти."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Сполучити"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Роз'єднати �получені контакти «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Роз'єднати ці �получені контакти? Це повні�тю розділить �получені контакти в "
-"окремі контакти."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Роз'єднати"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "І�торі�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показати"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Балачка в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Балачка з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2395,7 +2337,7 @@ msgstr[0] "%s �екунду"
 msgstr[1] "%s �екунди"
 msgstr[2] "%s �екунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2403,186 +2345,186 @@ msgstr[0] "%s хвилину"
 msgstr[1] "%s хвилини"
 msgstr[2] "%s хвилин"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Виклик прийн�то в %s, закінчено о %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Будь-коли"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Будь-хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Коли"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Будь-що"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Тек�това балачка"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Вхідні виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Вихідні виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропущені виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Що"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Вилучити в�і журнали з попередньої розмови?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очи�тити в�е"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Вилучити з:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Завантаженн�…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Балачка"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "З_міни"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Вилучити в�ю і�торію…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Відео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Балачка"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "З_міни"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Відео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�торінка 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Завантаженн�…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Контакт поза мережею"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Вказаний контакт недій�ний або невідомий"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "Контакт не підтримує такого роду розмову"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Потрібну функціональні�ть не впроваджено дл� цього протоколу"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "�еможливо почати розмову із заданих контактом"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Ви заблоковані на цьому каналі"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Цей канал переповнений"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Щоб приєднати�ь до цього каналу, потрібно бути запрошеним"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "�еможливо продовжувати прот�гом від'єднанн�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Відмовлено в до�тупі"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Помилка започаткуванн� розмови"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Введіть ідентифікатор контакту або номер телефону:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "�ова розмова"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Відеовиклик"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_�удіовиклик"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Створити виклик"
 
@@ -2638,7 +2580,7 @@ msgstr "Вла�ні повідомленн�…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "�овий обліковий запи� %s"
@@ -2648,20 +2590,20 @@ msgid "Find:"
 msgstr "Знайти:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "З _урахуванн�м регі�тру"
+msgid "_Previous"
+msgstr "_�азад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фразу не знайдено"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Далі"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "З _урахуванн�м регі�тру"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_�азад"
+msgid "Phrase not found"
+msgstr "Фразу не знайдено"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2707,12 +2649,12 @@ msgstr "Голо�овий виклик закінчено"
 msgid "Edit Custom Messages"
 msgstr "Редагувати вла�ні повідомленн�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Повідомленн� змінено в %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Звичайна"
 
@@ -2788,34 +2730,38 @@ msgid "Certificate hostname: %s"
 msgstr "�азва вузла �ертифіката: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продовжити"
+msgid "C_ontinue"
+msgstr "Пр_одовжити"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�адійне з'єднанн�"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Це ненадійне з'єднанн�. Однаково продовжити?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запам'�тати вибір дл� подальших з'єднань"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Подробиці про �ертифікат"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "�еможливо відкрити URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "�едо�татньо вільного мі�ц� дл� збереженн� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2824,7 +2770,7 @@ msgstr ""
 "Потрібно %s вільного мі�ц� дл� збереженн� цього файла, проте до�тупно лише "
 "%s. Будь ла�ка, виберіть інакше мі�це."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вхідний файл з %s"
@@ -3004,23 +2950,23 @@ msgstr "�емає повідомленн� про помилку"
 msgid "Instant Message (Empathy)"
 msgstr "Миттєві повідомленн� (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "�е з'єднувати�� під ча� запу�ку"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е показувати �пи�ок контактів чи інші вікна під ча� запу�ку"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— клієнт обміну миттєвими повідомленн�ми Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Помилка менеджера облікових запи�ів"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3078,223 +3024,83 @@ msgstr ""
 "Сергій Пана�енко <nitay@users.sourceforge.net>\n"
 "Daniel Korostil <ted.korostiled@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Помилка при імпортуванні облікових запи�ів"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Помилка при аналізуванні даних облікових запи�ів."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Помилка при �творенні облікових запи�ів."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Виникла помилка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Повідомленн� про помилку: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Ви можете або повернути�ь назад та �пробувати вве�ти дані вашого облікового "
-"запи�у або завершити помічника та додати облікові запи�и потім у меню "
-"«Зміни»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
-msgid "An error occurred"
-msgstr "Виникла помилка"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Який тип облікового запи�у дл� балачки ви маєте?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Маєте будь-�кий інший обліковий запи� балачки, �кий треба налаштувати?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Введіть подробиці облікового запи�у"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Який тип облікового запи�у дл� балачки �творити?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Маєте будь-�кі інші облікові запи�у дл� балачки?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Введіть параметри нового облікового запи�у"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy підтримує балачки з іншими о�обами у мережі та з друз�ми і колегами, "
-"�кі кори�тують�� Google Talk, AIM, Windows Live та багатьма іншими "
-"програмами �пілкуванн�. Якщо у ва� є мікрофон чи веб-камера, ви також можете "
-"робити голо�ові та відеовиклики."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "У ва� є обліковий запи�, �кий ви викори�товувати з іншою програмою?"
-
-#: ../src/empathy-account-assistant.c:653
-msgid "Yes, import my account details from "
-msgstr "Так, імпортувати параметри облікового запи�у з "
-
-#: ../src/empathy-account-assistant.c:674
-msgid "Yes, I'll enter my account details now"
-msgstr "Так, � введу параметри облікового запи�у вручну"
-
-#: ../src/empathy-account-assistant.c:696
-msgid "No, I want a new account"
-msgstr "�і, � бажаю �творити новий обліковий запи�"
-
-#: ../src/empathy-account-assistant.c:706
-msgid "No, I just want to see people online nearby for now"
-msgstr "�і, � про�то бажаю бачити людей, �кі у мережі й поблизу"
-
-#: ../src/empathy-account-assistant.c:727
-msgid "Select the accounts you want to import:"
-msgstr "Виберіть обліковий запи� дл� імпортуванн�:"
-
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Так"
-
-#: ../src/empathy-account-assistant.c:821
-msgid "No, that's all for now"
-msgstr "�і, наразі до�ить"
-
-#: ../src/empathy-account-assistant.c:1086
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy може автоматично знайти людей, приєднаних до тієї ж мережі, що й ви. "
-"Якщо ви хочете викори�товувати цю можливі�ть, відмітьте, що наведена нижче "
-"інформаці� є коректною. Ви можете змінити цю інформацію пізніше або вимкнути "
-"цю можливі�ть, викори�товуючи вікно «Облікові запи�и»."
-
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
-msgid "Edit->Accounts"
-msgstr "Зміни->Облікові запи�и"
-
-#: ../src/empathy-account-assistant.c:1108
-msgid "I do _not want to enable this feature for now"
-msgstr "�і, � _не бажаю зараз вмикати цю функцію"
-
-#: ../src/empathy-account-assistant.c:1144
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ви не можете �пілкувати�� з людьми, приєднаними до вашої локальної мережі, "
-"о�кільки не в�тановлено telepathy-salut. Якщо вам потрібна ц� можливі�ть, "
-"в�тановіть пакет telepathy-salut та �творіть обліковий запи� «Люди поблизу» "
-"у вікні «Облікові запи�и»"
-
-#: ../src/empathy-account-assistant.c:1150
-msgid "telepathy-salut not installed"
-msgstr "�е в�тановлено telepathy-salut"
-
-#: ../src/empathy-account-assistant.c:1196
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Ли�туванн� та облікові запи�и VoIP"
-
-#: ../src/empathy-account-assistant.c:1230
-msgid "Welcome to Empathy"
-msgstr "Ла�каво про�ило до Empathy"
-
-#: ../src/empathy-account-assistant.c:1239
-msgid "Import your existing accounts"
-msgstr "Імпортувати на�вні облікові запи�и"
-
-#: ../src/empathy-account-assistant.c:1257
-msgid "Please enter personal details"
-msgstr "Введіть пер�ональну інформацію"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Є незбережені зміни у вашому обліковому запи�і %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "�овий обліковий запи� ще не збережено."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "З'єднанн�…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Поза мережею — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Від'єднаний — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Поза мережею — немає з'єднанн� з мережею"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "�евідомий �тан"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Цей обліковий запи� вимкнено, бо воно �пираєть�� на �тарий, непідтримуваний "
+"модуль. У�тановіть telepathy-haze й перезавантажте �еан�, щоб перемі�тити "
+"обліковий запи�. "
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Поза мережею — Обліковий запи� вимкнено"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Ви намагаєте�ь �творити новий обліковий запи�, що призведе до\n"
-"відкиданн� змін. Продовжити?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Редагувати параметри з'єднанн�"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "�е вдало�ь одержати ваших о�оби�тих відомо�тей із �ервера."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Увійти в мережу, щоб редагувати о�оби�ті відомо�ті."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Редагувати параметри з'єднанн�…"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Вилучити «%s» з комп'ютера?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Це не призведе до вилученн� облікового запи�у на �ервері."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3303,15 +3109,23 @@ msgstr ""
 "відкиданн� змін. Продовжити?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Увімкнено"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Вимкнено"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Пропу�тити"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_З'єднати�ь"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3323,19 +3137,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Додати…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Завантаженн� інформатизації про обліковий запи�"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�емає в�тановлених протоколів"
+msgid "_Import…"
+msgstr "_Імпортувати…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Завантаженн� інформатизації про обліковий запи�"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3343,120 +3153,116 @@ msgstr ""
 "Щоб додати новий обліковий запи�, в�тановіть підтримуванн� кожного "
 "потрібного протоколу."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Імпортувати…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "�е в�тановлено жодного протокольного модул� "
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — клієнт автентифікації Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Клієнт аутентифікаці� Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Люди поблизу"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— аудіо- та відеоклієнт Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "�удіо- та відеоклієнт Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Я�краві�ть"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Гамма"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Гучні�ть"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Бічна панель"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Звуковий вхід"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Відеовхід"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Панель набору"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Подробиці"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Виклик з %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "�дре�а IP, �ку показано на машині"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "�дре�а IP, �ку показано на �ервері через інтернет"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�дре�а IP вузла, �ку показано по ту �торону"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "�дре�а IP �ервера ретран�л�ції"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "�дре�а IP групової тран�л�ції"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "codec"
 msgid "Unknown"
 msgstr "�евідомо"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "З'єднанн� — %d:%02dm "
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Технічні подробиці"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3464,8 +3270,8 @@ msgid ""
 msgstr ""
 "Програма %s не розпізнає аудіоформати, що підтримують�� вашим комп'ютером"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3473,8 +3279,8 @@ msgid ""
 msgstr ""
 "Програма %s не розпізнає відеоформати, що підтримують�� вашим комп'ютером"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3483,29 +3289,29 @@ msgstr ""
 "�е вдало�ь в�тановити з'єднанн� з %s. Один з ва� може знаходити�� у мережі, "
 "�ка не підтримує пр�мі з'єднанн�."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Помилка мережі"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�удіоформати, що потрібні дл� цього виклику, не в�тановлено на вашому "
 "комп'ютері"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Відеоформати, що потрібні дл� цього виклику, не в�тановлено на вашому "
 "комп'ютері"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3322,211 @@ msgstr ""
 "помилку</a> та прикріпіть журнали, зібрані з вікна зневадженн� у меню "
 "«Довідка»."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Помилка у рушії виклику"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "До��гнуто кінц� потоку"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�е вдало�ь в�тановити аудіопотік"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�е вдало�ь в�тановити відеопотік"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�удіо"
+msgid "_Call"
+msgstr "_Виклик"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек декодуванн�:"
+msgid "_Microphone"
+msgstr "_Мікрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Вимкнути камеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Показати панель набору"
+msgid "_Settings"
+msgstr "_Параметри"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек кодуванн�:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "П_ерегл�д"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Розірвати зв'�зок"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Довідка"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершити поточний виклик"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Змі�т"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальні кандидати:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Зневад_женн�"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Розгорнути мене"
+msgid "Swap camera"
+msgstr "Замінити камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Згорнути мене"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Віддалений кандидат:"
+msgid "Maximise me"
+msgstr "Розгорнути мене"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "�аді�лати звук"
+msgid "Disable camera"
+msgstr "Вимкнути камеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "�аді�лати відео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Розірвати зв'�зок"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Показати панель набору"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Завершити поточний виклик"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Відеовиклик"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Зробити відеовиклик"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Зробити аудіовиклик"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Замінити камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Перемкнути передаванн� звуку"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Перемкнути передаванн� відео"
+msgid "Show dialpad"
+msgstr "Показати панель набору"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "�евідомо"
+msgid "Display the dialpad"
+msgstr "Показати панель набору"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "�аді�лати відео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Відеовиклик"
+msgid "Toggle video transmission"
+msgstr "Перемкнути передаванн� відео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Виклик"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "�аді�лати звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Змі�т"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Перемкнути передаванн� звуку"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Зневад_женн�"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодек кодуванн�:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Довідка"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "�евідомо"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Кодек декодуванн�:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Мікрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Віддалений кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Параметри"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локальні кандидати:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "П_ерегл�д"
+msgid "Audio"
+msgstr "�удіо"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрити це вікно?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Закритт� цього вікна покине %s. Ви не одержуватимете подальші повідомленн�, "
+"поки не приєднаєте�ь знову."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Закритт� цього вікна покине %u кімнату балачки. Ви не одержуватимете подальші "
+"повідомленн�, поки не приєднаєте�ь знову."
+msgstr[1] ""
+"Закритт� цього вікна покине %u кімнати балачки. Ви не одержуватимете "
+"подальші повідомленн�, поки не приєднаєте�ь знову."
+msgstr[2] ""
+"Закритт� цього вікна покине %u кімнат балачки. Ви не одержуватимете подальші "
+"повідомленн�, поки не приєднаєте�ь знову."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Покинути %s? "
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Ви не одержуватимете подальші повідомленн�, поки не приєднаєте�ь знову."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрити вікно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Покинути кімнату"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3678,7 +3534,7 @@ msgstr[0] "%s (%d непрочитане)"
 msgstr[1] "%s (%d непрочитаних)"
 msgstr[2] "%s (%d непрочитані)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3686,7 +3542,7 @@ msgstr[0] "%s (та %u інше)"
 msgstr[1] "%s (та %u інших)"
 msgstr[2] "%s (та %u інших)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3694,7 +3550,7 @@ msgstr[0] "%s (%d непрочитане від інших)"
 msgstr[1] "%s (%d непрочитаних від інших)"
 msgstr[2] "%s (%d непрочитаний від інших)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3702,11 +3558,11 @@ msgstr[0] "%s (%d непрочитане від у�іх)"
 msgstr[1] "%s (%d непрочитаних від у�іх)"
 msgstr[2] "%s (%d непрочитаний від у�іх)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3714,69 +3570,69 @@ msgstr[0] "�ад�иланн� %d повідомленн�"
 msgstr[1] "�ад�иланн� %d повідомлень"
 msgstr[2] "�ад�иланн� %d повідомлень"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "�абирає повідомленн�."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "О_чи�тити"
+msgid "_Conversation"
+msgstr "_Розмова"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Контакт"
+msgid "C_lear"
+msgstr "О_чи�тити"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "В�тавити _емоційку"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Улюблена кімната"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Запро�ити _уча�ника…"
+msgid "Notify for All Messages"
+msgstr "Сповіщати про в�і повідомленн�"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Перемі�тити вкладку _ліворуч"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Показати _�пи�ок контактів"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Перемі�тити вкладку _праворуч"
+msgid "Invite _Participant…"
+msgstr "Запро�ити _уча�ника…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Сповіщати про в�і повідомленн�"
+msgid "C_ontact"
+msgstr "_Контакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Розмова"
+msgid "_Tabs"
+msgstr "_Вкладки"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Відокремити вкладку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Улюблена кімната"
+msgid "_Previous Tab"
+msgstr "_Попередн� закладка"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_�а�тупна закладка"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Попередн� закладка"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Повернути закриті вкладки"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Показати _�пи�ок контактів"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Перемі�тити вкладку _ліворуч"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Вкладки"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Перемі�тити вкладку _праворуч"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Повернути закриті вкладки"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Відокремити вкладку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3790,100 +3646,100 @@ msgstr "Кімната"
 msgid "Auto-Connect"
 msgstr "�втоматичне з'єднанн�"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Керуванн� улюбленими кімнатами"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Вхідний відеовиклик"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Вхідний виклик"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Відеовиклик від %s, відпові�ти?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Виклик від %s, відпові�ти?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вхідний виклик від %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Від_хилити"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Відпові�ти"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Відпові�ти через відео"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вхідний відеовиклик від %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Кімната запрошенн�"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Запрошенн� приєднати�ь до %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s запрошує ва� увійти у %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "Від_хилити"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Увійти"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s запро�ив ва� увійти у %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Ва� запрошено приєднати�ь до %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вхідне передаванн� файла від %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Потрібно пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s потребує дозволу, щоб знати, коли ви в мережі"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4003,7 +3859,11 @@ msgstr "Передаванн� файлів"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Вилученн� завершено, �ка�овано й помилка передаванн� файлів зі �пи�ку"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Імпортувати"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4011,170 +3871,185 @@ msgstr ""
 "�е знайдено облікових запи�ів дл� імпортуванн�. Empathy на цей момент "
 "підтримує імпортуванн� контактів лише з Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Імпортуванн� облікових запи�ів"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Імпортувати"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол:"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Джерело"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Вкажіть пароль"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Від'єднати"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Потрібно налаштувати обліковий запи�, щоб побачити контакти тут."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Збігів не знайдено"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
-"Вибачте, обліковий запи� %s неможливо викори�товувати, поки програму %s не буде "
-"оновлено."
+"Вибачте, обліковий запи� %s неможливо викори�товувати, поки програму %s не "
+"буде оновлено."
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Оновити програму…"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрити"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Перез'єднати"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Редагуванн� облікового запи�у"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Поповнити %s (%s)…"
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Поповнити рахунок"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Поповнити…"
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Потрібно ввімкнути один з облікових запи�ів, щоб побачити контакти тут."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Потрібно ввімкнути %s, щоб побачити контакти тут."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спи�ок контактів"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Контакти на _карті"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Параметри облікового запи�у"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Залишок"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ова розмова…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Знайти у _�пи�ку контактів"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�овий _виклик…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Залучити _улюблених"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пошук дл� контактів…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�алаштувати _улюблених"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Передаванн� _файлів"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "З_вичайний розмір"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Показувати від�утніх"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�овий _виклик…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Показати _протокол:"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Звичайний розмір _аватарів"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Залишок"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Контакти на _карті"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Облікові запи�и"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "За_блоковані контакти"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Параметри"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Показати _протокол:"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Знайти у _�пи�ку контактів"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Впор�дкувати за _п�евдонімом"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Впор�дкувати за �_таном"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Облікові запи�и"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Звичайний розмір _аватарів"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "За_блоковані контакти"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "З_вичайний розмір"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактний розмір"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Передаванн� _файлів"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Кімната"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Увійти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_�ова розмова…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Показувати від�утніх"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_О�оби�та інформаці�"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Кімната"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Залучити _улюблених"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пошук дл� контактів…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�алаштувати _улюблених"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4186,7 +4061,7 @@ msgstr "Уча�ники"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4199,22 +4074,27 @@ msgstr ""
 "Вимога паролю: %s\n"
 "Уча�ники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�і"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�еможливо перелічити кімнати"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�еможливо зупинити перелічуванн� кімнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�еможливо завантажити �пи�ок кімнат"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Увійти у кімнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4224,6 +4104,10 @@ msgstr ""
 "декілька кімнат зі �пи�ку."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Кімната:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4231,18 +4115,14 @@ msgstr ""
 "Введіть �ервер бе�іди, або залиште порожнім, �кщо бе�іда знаходить�� на "
 "поточному �ервері"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Увійти у кімнату"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�еможливо завантажити �пи�ок кімнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ок бе�ід"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Кімната:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "�адійшло повідомленн�"
@@ -4256,7 +4136,7 @@ msgid "New conversation"
 msgstr "�ова розмова"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Контакт входить у мережу"
 
 #: ../src/empathy-preferences.c:170
@@ -4276,373 +4156,398 @@ msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Джульєтта"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео! О, навіщо ти Ромео?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Зміни �воє ім'�, зречи�� батька;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Як ні, то при��гни мені в коханні,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "І більше � не буду Капулетті."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "По�лухать — чи відпові�ти відразу?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Джульєтта від'єднала�ь."
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Параметри"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Показувати _емоційки графічно"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Показати _�пи�ок контактів у кімнаті"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Вигл�д"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведінка"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Розпочати розмову в:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Т_ема бе�іди:"
+msgid "new ta_bs"
+msgstr "новій вк_ладці"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Вимкнути �повіщенн� у �тані «_відійшов» або «зайн�тий»"
+msgid "new _windows"
+msgstr "новому _вікні"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Вимкнути звуки у �тані «_відійшов» або «зайн�тий»"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показувати вхідні події в діл�нці �повіщень"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�втоматично з'єднувати�ь при запу�ку"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"У�уненн� відлунн� допоможе зробити ваш голо� чи�тішим дл� інших, але може "
-"викликати певні проблеми на де�ких комп'ютерах. Якщо ви або інша о�оба чує "
-"дивні звуки або дефекти прот�гом дзвінка, �пробуйте вимкнути у�уненн� "
-"відлунн� і передзвонити."
+msgid "Log conversations"
+msgstr "Журнал розмов"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Показувати �повіщенн�, коли контакт входить в мережу"
+msgid "Behavior"
+msgstr "Поведінка"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Показувати �повіщенн�, коли контакт залишає мережу"
+msgid "General"
+msgstr "Загальне"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Показувати �повіщенн�, коли вікно _чату не активне"
+msgid "_Enable bubble notifications"
+msgstr "_Ввімкнути контек�тні �повіщенн�"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Увімкнути перевір�нн� орфографії дл� мов:"
+msgid "Disable notifications when _away or busy"
+msgstr "Вимкнути �повіщенн� у �тані «_відійшов» або «зайн�тий»"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Загальне"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Показувати �повіщенн�, коли вікно _чату не активне"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Показувати �повіщенн�, коли контакт входить в мережу"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Джерела мі�цево�ті:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Показувати �повіщенн�, коли контакт залишає мережу"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Журнал розмов"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Сповіщенн�"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Ввімкнути звукові �повіщенн�"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Звукові �игнали при поді�х"
+msgid "Disable sounds when _away or busy"
+msgstr "Вимкнути звуки у �тані «_відійшов» або «зайн�тий»"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Приватні�ть"
+msgid "Play sound for events"
+msgstr "Звукові �игнали при поді�х"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Зниженн� точно�ті визначенн� мі�цево�ті дозвол�є публікувати лише мі�то,"
-"регіон та країну. Точні�ть GPS координат визначаєть�� 1 де��тковою позицією."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Показувати _емоційки графічно"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Показати _�пи�ок контактів у кімнаті"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Звуки"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Перевір�нн� орфографії"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Скори�тати�ь у�уненн�м від_лунн� дл� покращенн� �ко�ті викликів"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"<small>У цьому �пи�ку показані лише мови, дл� �ких в�тановлено �ловники.</"
-"small>"
+"У�уненн� відлунн� допоможе зробити ваш голо� чи�тішим дл� інших, але може "
+"викликати певні проблеми на де�ких комп'ютерах. Якщо ви або інша о�оба чує "
+"дивні звуки або дефекти прот�гом дзвінка, �пробуйте вимкнути у�уненн� "
+"відлунн� і передзвонити."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Теми"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Публікувати мі�цево�ті моїм контактам"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Скори�тати�ь у�уненн�м від_лунн� дл� покращенн� �ко�ті викликів"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Зниженн� точно�ті визначенн� мі�цево�ті дозвол�є публікувати лише мі�то,"
+"регіон та країну. Точні�ть GPS координат визначаєть�� 1 де��тковою позицією."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Варіант:"
+msgid "_Reduce location accuracy"
+msgstr "По_низити точні�ть визначенн� мі�цево�ті"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_�втоматично з'єднувати�ь при запу�ку"
+msgid "Privacy"
+msgstr "Приватні�ть"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Мобільний телефон"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Ввімкнути контек�тні �повіщенн�"
+msgid "_Cellphone"
+msgstr "_Мобільний телефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Ввімкнути звукові �повіщенн�"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Мережа (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Джерела мі�цево�ті:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Відкривати нові бе�іди в окремому вікні"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>У цьому �пи�ку показані лише мови, дл� �ких в�тановлено �ловники.</"
+"small>"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Публікувати мі�цево�ті моїм контактам"
+msgid "Enable spell checking for languages:"
+msgstr "Увімкнути перевір�нн� орфографії дл� мов:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Перевір�нн� орфографії"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "По_низити точні�ть визначенн� мі�цево�ті"
+msgid "Chat Th_eme:"
+msgstr "Т_ема бе�іди:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Варіант:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Теми"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Викликати контакт знову"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Вимкнути камеру"
+msgid "Redial"
+msgstr "Повторно набрати номер"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Увімкнути камеру"
+msgid "V_ideo"
+msgstr "_Відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Вимкнути відео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Вимкнути камеру та зупинити передаванн� відео"
+msgid "Video Preview"
+msgstr "Перегл�д відео"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Увімкнути камеру та передавати відео"
+msgid "Video On"
+msgstr "Увімкнути відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Увімкнути камеру, але не передавати відео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Викликати контакт знову"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Перегл�д"
+msgid "Camera Off"
+msgstr "Вимкнути камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набрати номер"
+msgid "Disable camera and stop sending video"
+msgstr "Вимкнути камеру та зупинити передаванн� відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Відео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Перегл�д"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Вимкнути відео"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Увімкнути камеру, але не передавати відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Увімкнути відео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Увімкнути камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Перегл�д відео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Увімкнути камеру та передавати відео"
 
-#: ../src/empathy-map-view.c:458
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Карта контактів"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "По�иланн� Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Відповідь Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Дані надто довгі дл� одного в�тавленн�. Збережіть журнали у файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Вікно зневадженн�"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "�аді�лати у pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Рівень"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Зневадженн�"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Інформаці�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Повідомленн�"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Попередженн�"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Помилка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Ча�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категорі�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Рівень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Вибраний менеджер з'єднань не підтримує розширенн� віддаленого зневадженн� "
 
-#: ../src/empathy-invite-participant-dialog.c:198
-#: ../src/empathy-invite-participant-dialog.c:226
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Запро�ити уча�ника"
 
-#: ../src/empathy-invite-participant-dialog.c:199
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Виберіть контакт дл� запрошенн� до бе�іди:"
 
-#: ../src/empathy-invite-participant-dialog.c:222
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Запро�ити"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е показувати вікна; виконати роботу (наприклад, імпортуванн�) та вийти"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е показувати �кі-небудь вікна, �кщо це не обліковий запи� «Людей поблизу»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спочатку виберіть заданий обліковий запи� (наприклад, gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Показувати помічника облікових запи�ів"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— облікові запи�и Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Облікові запи�и Empathy"
 
@@ -4658,85 +4563,85 @@ msgstr "— зневадженн� Empathy"
 msgid "Empathy Debugger"
 msgstr "Зневадженн� Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— клієнт балачок Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Відгукнути�ь"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Відкинути"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Відпові�ти"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Відпові�ти через відео"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Відхилити"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прийн�ти"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "�адати"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s намагав�� зв'�зати�ь з вами, але втой ча� ви мали розмову з іншим."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Ñ–"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "В очікуванні"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Приглушити"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Тривалі�ть"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ваш поточний залишок �тановить %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вибачте, але у ва� недо�татньо залишку, щоб здій�нити виклик."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Поповнити"
 
@@ -4744,6 +4649,227 @@ msgstr "Поповнити"
 msgid "_Match case"
 msgstr "_З урахуванн�м регі�тру"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Який тип облікового запи�у дл� балачки ви маєте?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Доданн� облікового запи�у"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Люди поблизу"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy може автоматично шукати і розмовл�ти з людьми, під'єднаних до однієї "
+"ж мережі з вами. Якщо бажаєте �кори�тати�ь такою можливі�тю, перевірте, чи "
+"подробиці нижче правильні."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Можете змінити ці подробиці згодом або вимкнути цю можливі�ть, вибравши "
+"<span style=\"italic\">Зміни → Облікові запи�и</span> у �пи�ку контактів."
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Мої мережеві облікові запи�и "
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Обліковий запи� %s змінено через %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Обліковий запи� %s неможливо редагувати в Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Запу�тити мій обліковий запи� із �айту"
+
+#~ msgid "Edit %s"
+#~ msgstr "Редагувати %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Ска�увати"
+
+#~ msgid "Personal Information"
+#~ msgstr "О�оби�та інформаці�"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "З_міни"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Пов'�зані контакти"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Вибрати контакт дл� по�иланн�"
+
+#~ msgid "New contact preview"
+#~ msgstr "Перегл�д нового контакту"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Контакти вибрані в �пи�ку зліва буде �получено разом."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Сполучити контакт…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Сполучити контакти"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Роз'єднати…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Повні�тю розділити показані �получені контакти в окремі контакти."
+
+#~ msgid "_Link"
+#~ msgstr "_Сполучити"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Роз'єднати �получені контакти «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Роз'єднати ці �получені контакти? Це повні�тю розділить �получені "
+#~ "контакти в окремі контакти."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Роз'єднати"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Помилка при імпортуванні облікових запи�ів"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Помилка при аналізуванні даних облікових запи�ів."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Помилка при �творенні облікових запи�ів."
+
+#~ msgid "There was an error."
+#~ msgstr "Виникла помилка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Повідомленн� про помилку: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Ви можете або повернути�ь назад та �пробувати вве�ти дані вашого "
+#~ "облікового запи�у або завершити помічника та додати облікові запи�и потім "
+#~ "у меню «Зміни»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Виникла помилка"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr ""
+#~ "Маєте будь-�кий інший обліковий запи� балачки, �кий треба налаштувати?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Введіть подробиці облікового запи�у"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Який тип облікового запи�у дл� балачки �творити?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Маєте будь-�кі інші облікові запи�у дл� балачки?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Введіть параметри нового облікового запи�у"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy підтримує балачки з іншими о�обами у мережі та з друз�ми і "
+#~ "колегами, �кі кори�тують�� Google Talk, AIM, Windows Live та багатьма "
+#~ "іншими програмами �пілкуванн�. Якщо у ва� є мікрофон чи веб-камера, ви "
+#~ "також можете робити голо�ові та відеовиклики."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "У ва� є обліковий запи�, �кий ви викори�товувати з іншою програмою?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Так, імпортувати параметри облікового запи�у з "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Так, � введу параметри облікового запи�у вручну"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�і, � бажаю �творити новий обліковий запи�"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�і, � про�то бажаю бачити людей, �кі у мережі й поблизу"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Виберіть обліковий запи� дл� імпортуванн�:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�і, наразі до�ить"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Зміни->Облікові запи�и"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "�і, � _не бажаю зараз вмикати цю функцію"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ви не можете �пілкувати�� з людьми, приєднаними до вашої локальної "
+#~ "мережі, о�кільки не в�тановлено telepathy-salut. Якщо вам потрібна ц� "
+#~ "можливі�ть, в�тановіть пакет telepathy-salut та �творіть обліковий запи� "
+#~ "«Люди поблизу» у вікні «Облікові запи�и»"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Ли�туванн� та облікові запи�и VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Ла�каво про�ило до Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Імпортувати на�вні облікові запи�и"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Введіть пер�ональну інформацію"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ви намагаєте�ь �творити новий обліковий запи�, що призведе до\n"
+#~ "відкиданн� змін. Продовжити?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_О�оби�та інформаці�"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Відкривати нові бе�іди в окремому вікні"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Показувати помічника облікових запи�ів"
+
 #~ msgid "Call volume"
 #~ msgstr "Гучні�ть виклику"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f83f27e6..d78765b93 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,17 +15,19 @@
 # Tao Wang <dancefire@gmail.com>, 2010.
 # Dean Lee <xslidian@gmail.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Yinghua Wang <wantinghard@gmail.com>, 2010
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
 # zhen liu  <liuzhen1191@gmail.com>, 2011
+# Yangtse Su <yangtsesu@gmail.com>, 2011
+# Mike Manilone <crtmike@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-11-24 11:51+0000\n"
-"PO-Revision-Date: 2011-11-25 21:46+0800\n"
-"Last-Translator: Yangtse Su <yangtsesu@gmail.com>\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-02-26 11:57+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,472 +36,520 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "使用 Google Talk�Facebook�MSN 以�许多其它�天�务"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "�时通讯客户端"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy �时通讯程�"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "�时通讯客户端"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk�Facebook�MSN 以�许多其它�天�务"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "消�和 VoIP ��"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管�消�和 VoIP ��"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "总是为新�天打开�独的�天窗�。"
+msgid "Connection managers should be used"
+msgstr "应该使用连接管�器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "相机设备"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是�使用连接管�器自动断开连接或�新连接。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "相机�置"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy �动时是�自动连接"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "在群�中使用昵称补全时在昵称��添加的字符。"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy 是�在�动时自动登入您的��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "�天窗�主题"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是�自动离开"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "�天窗�主题�生"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是�应在用户空闲时自动进入离开模�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "用于拼写检查器的语言的列表，以逗�分隔(例如：en, fr, nl)。"
+msgid "Empathy default download folder"
+msgstr "Empathy 默认下载文件夹"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "紧凑显示�系人列表"
+msgid "The default folder to save file transfers in."
+msgstr "�存传�文件的默认文件夹。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "应该使用连接管�器"
+msgid "Show offline contacts"
+msgstr "显示离线�系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "�系人列表排��件"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "是�显示�系人清�中离线的�系人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
+msgid "Show avatars"
+msgstr "显示头�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "视频呼�时默认使用的相机设备，例如 /dev/video0。"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "是�在�系人列表和�天窗�中显示头�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "默认的选�头�图片的目录"
+msgid "Show protocols"
+msgstr "显示�议"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "离开时�用弹出�示"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是�在�系人列表和�天窗�中显示�议。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "离开时�用声音"
+msgid "Show Balance in contact list"
+msgstr "在�系人列表中显示余�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "在状��显示呼入事件。"
+msgid "Whether to show account balances in the contact list."
+msgstr "是�在�系人列表和�天窗�中显示余�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr "在状��显示呼入事件。如果为 false 则立�显示给用户。"
+msgid "Compact contact list"
+msgstr "紧凑显示�系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "回声抑制支�"
+msgid "Whether to show the contact list in compact mode."
+msgstr "是�以紧凑模�显示�系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy 能够�布用户的�置"
+msgid "Hide main window"
+msgstr "��主窗�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS �估计�置"
+msgid "Hide the main window."
+msgstr "��主窗�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机�估计�置"
+msgid "Default directory to select an avatar image from"
+msgstr "默认的选�头�图片的目录"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络�估计�置"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "上次选�头�图片的目录。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy 默认下载文件夹"
+msgid "Open new chats in separate windows"
+msgstr "在�独窗�中打开新�天"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy 空闲时是�自动离开"
+msgid "Always open a separate chat window for new chats."
+msgstr "总是为新�天打开�独的�天窗�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy �动时是�自动连接"
+msgid "Display incoming events in the status area"
+msgstr "在状��显示呼入事件。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "�低 Emapthy �置信�的准确度"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在状��显示呼入事件。如果为 false 则立�显示给用户。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy 是�使用�系人头�作为�天窗�图标"
+msgid "The position for the chat window side pane"
+msgstr "�天窗�边�的�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "�用 WebKit 开�工具"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "�天窗�边��存的�置(�素)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "�用新消�弹出�示"
+msgid "Show contact groups"
+msgstr "显示�系人分组"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "�用拼写检查器"
+msgid "Whether to show groups in the contact list."
+msgstr "是�在�系人列表中显示分组。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "��主窗�"
+msgid "Contact list sort criterion"
+msgstr "�系人列表排��件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "��主窗�。"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"使用何��件�排��系人列表。默认情况下使用值“状��以按�系人状�排�。�值"
+"为“姓��时将按姓�排��系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "在加入�天室对�框中最�选择的��"
+msgid "Use notification sounds"
+msgstr "使用通知声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "昵称补全字符"
+msgid "Whether to play a sound to notify of events."
+msgstr "是�需�事件�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "在�独窗�中打开新�天"
+msgid "Disable sounds when away"
+msgstr "离开时�用声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Adium 主题的路径"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是�使用声音�示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "如果�天使用 Adium 主题，使用 Adium 主题的路径"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到消�时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "新对�时播放声音"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "是�需�消�到达�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "�出消�时播放声音"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是�为外出消�使用声音�示。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "�系人登录时播放声音"
+msgid "Play a sound for new conversations"
+msgstr "新对�时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "�系人注销时播放声音"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是�需�新会��示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "登录时播放声音"
+msgid "Play a sound when a contact logs in"
+msgstr "�系人登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "注销时播放声音"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "是�需��系人上线�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "如果�天窗��是焦点则弹出消�通知"
+msgid "Play a sound when a contact logs out"
+msgstr "�系人注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "当�系人登录时弹出通知"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "是�需��系人下线�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "当�系人注销时弹出通知"
+msgid "Play a sound when we log in"
+msgstr "登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "在通�时摄�头预览的�置。"
+msgid "Whether to play a sound when logging into a network."
+msgstr "当�网登录时是�播放�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "在�系人列表中显示余�"
+msgid "Play a sound when we log out"
+msgstr "注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "显示头�"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "当网络断开时是�播放�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "在�天室显示�系人列表"
+msgid "Enable popup notifications for new messages"
+msgstr "�用新消�弹出�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "关闭主窗�时显示�示"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "当收到新消�时是�弹出显示�示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "显示离线�系人"
+msgid "Disable popup notifications when away"
+msgstr "离开时�用弹出�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "显示�议"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是�弹出显示�示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "拼写检查器语言"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "如果�天窗��是焦点则弹出消�通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "�存传�文件的默认文件夹。"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "如果�天窗�已开�，但�是当�窗�，接收新消�时是�弹出�示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "上次选�头�图片的目录。"
+msgid "Pop up notifications when a contact logs in"
+msgstr "当�系人登录时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "�天窗�边�的�置"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "当�系人上线时是�显示弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "�天窗�边��存的�置(�素)。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "当�系人注销时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "用于在�天窗�中显示会�的主题。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "当�系人离线时是�显示弹出通知。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "用于在�天窗�中显示会�的主题。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对�时是�将表情符�转�为表情图标。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "使用通知声音"
+msgid "Show contact list in rooms"
+msgstr "在�天室显示�系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "为�天室使用主题"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是�在�天室显示�系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "是��许 Empathy 将用户的�置共享给�系人"
+msgid "Chat window theme"
+msgstr "�天窗�主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "是��许 Empathy 通过 GPS 估计�置"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "用于在�天窗�中显示会�的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "是��许 Empathy 通过手机网络估计�置"
+msgid "Chat window theme variant"
+msgstr "�天窗�主题�生"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "是��许 Empathy 通过网络估计�置"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "用于在�天窗�中显示会�的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy 是�在�动时自动登入您的��。"
+msgid "Path of the Adium theme to use"
+msgstr "Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Empathy 是�应在用户空闲时自动进入离开模�。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "如果�天使用 Adium 主题，使用 Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
+msgid "Enable WebKit Developer Tools"
+msgstr "�用 WebKit 开�工具"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "是�使用�系人的头�作为�天窗�的图标。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开�工具，例如 Web Inspector 是�应该�用。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "告诉他人您正在输入"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "是�使用连接管�器自动断开连接或�新连接。"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是���“编写中�(composing)或“暂��(paused)的�天状�。目��影�“已离"
+"开�(gone)状�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "是�对您想�作拼写检查的��作拼写检查。"
+msgid "Use theme for chat rooms"
+msgstr "为�天室使用主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "对�时是�将表情符�转�为表情图标。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "是�对�天室使用主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "是��用 Pulseaudio 的回声抑制过滤器。"
+msgid "Spell checking languages"
+msgstr "拼写检查器语言"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "是�需��系人上线�示音。"
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "用于拼写检查器的语言的列表，以逗�分隔(例如：en, fr, nl)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "是�需��系人下线�示音。"
+msgid "Enable spell checker"
+msgstr "�用拼写检查器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "是�需�事件�示音。"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "是�对您想�作拼写检查的��作拼写检查。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "是�需�消�到达�示音。"
+msgid "Nick completed character"
+msgstr "昵称补全字符"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "是�需�新会��示音。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "在群�中使用昵称补全时在昵称��添加的字符。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "是�为外出消�使用声音�示。"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy 是�使用�系人头�作为�天窗�图标"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "当�网登录时是�播放�示音。"
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "是�使用�系人的头�作为�天窗�的图标。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "当网络断开时是�播放�示音。"
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入�天室对�框中最�选择的��"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "当离开或忙碌时是�使用声音�示。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "最�选择加入�天室的��的 D-Bus 对象路径。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "当�系人离线时是�显示弹出通知。"
+msgid "Camera device"
+msgstr "相机设备"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "当�系人上线时是�显示弹出通知"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "视频呼�时默认使用的相机设备，例如 /dev/video0。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr "如果�天窗�已开�，但�是当�窗�，接收新消�时是�弹出�示。"
+msgid "Camera position"
+msgstr "相机�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "当收到新消�时是�弹出显示�示框。"
+msgid "Position the camera preview should be during a call."
+msgstr "在通�时摄�头预览的�置。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "是�在�系人列表和�天窗�中显示余�。"
+msgid "Echo cancellation support"
+msgstr "回声抑制支�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "是�在�系人列表和�天窗�中显示头�。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是��用 Pulseaudio 的回声抑制过滤器。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "是�显示�系人清�中离线的�系人。"
+msgid "Show hint about closing the main window"
+msgstr "关闭主窗�时显示�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "当离开或忙碌时是�弹出显示�示框。"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题�中的“X�按钮关闭主窗�时是�显示�示对�框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "是�在�系人列表和�天窗�中显示�议。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够�布用户的�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "是�在�天室显示�系人列表。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "是��许 Empathy 将用户的�置共享给�系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "是�以紧凑模�显示�系人列表。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络�估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "当使用标题�中的“X�按钮关闭主窗�时是�显示�示对�框。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "是��许 Empathy 通过网络估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "是�对�天室使用主题。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机�估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "是��许 Empathy 通过手机网络估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS �估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "是��许 Empathy 通过 GPS 估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "�低 Emapthy �置信�的准确度"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"使用何��件�排��系人列表。默认情况下使用值“姓��以按�系人姓�排�。�值"
-"为“状��时将按状�排��系人列表。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管�消�和 VoIP ��"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "未指定原因"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
-msgid "Messaging and VoIP Accounts"
-msgstr "消�和 VoIP ��"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "需�状�改�信�"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "您�消了文件传输"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "�外的�与者�消了文件的传输"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "当传输这个文件的时候�生错误"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "�外的�与者无法传输这个文件"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完�，但该文件已��"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输�支�远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "所选文件是�正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接�电：%s"
@@ -515,450 +565,394 @@ msgstr "与 %s 通�"
 msgid "Call from %s"
 msgstr "�电：%s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "�支� Socket 类型"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "未指定原因"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "需�状�改�信�"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "您�消了文件传输"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "�外的�与者�消了文件的传输"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "当传输这个文件的时候�生错误"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "�外的�与者无法传输这个文件"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�身"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "状�已设置为离线"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "验�失败"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "用户�已�被�用"
+msgstr "用户�已被�用"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "未�供�书"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "�书已过期"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "�书尚未激活"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�书主机��匹�"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�书指纹�匹�"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "�书是自签属的"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "�书错误"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密��用"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "�书无效"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "连接被拒�"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "该资�已被连接至�务器"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "该��已连接到�务器"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相�资�的新连接�代"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "�务器太忙，无法处�当�连接"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "�书已被�销"
 
 # lainme：�书使用�安全的加密算法或是弱加密的
 # xslidian：�书使用的加密算法�安全或者易被破解
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "�书使用�安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "�务器�书的长度——或�务器�书链的深度——超出了加密库的硬性�制"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的软件版本太旧了"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "内部错误"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �时�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "将�"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "全部��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "密�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "�务器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "端�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "我的网络��"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s ��通过 %s 进行了编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s ��无法在 Empathy 中编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "�动我的网络��"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "编辑 %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "用户�："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在�务器上创建新的��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "�消(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新建��"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例如：</b> 我的�幕�称"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "密�(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "高级"
+msgid "Screen _Name:"
+msgstr "用户�(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的�幕�称"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "密�(_W)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "记�密�"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "记�密�"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "端�(_P)："
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "记�密�"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "用户�(_N)："
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "�务器(_S)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密�是什么？"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "您的 AIM �幕�称是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "端�(_P)："
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密�是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "�务器(_S)："
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例如：</b>用户�"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "记�密�"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户�"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "您的 GroupWise 用户�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "您的 GroupWise 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN："
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例如：</b>123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "字符集(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN："
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密�是什么？"
 
@@ -995,24 +989,28 @@ msgstr "选项"
 msgid "None"
 msgstr "æ— "
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "网络"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "网络："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "�务器"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr "大多数 IRC �务器�需�密�，如果您�确定，则��输入密�。"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "网络："
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "昵称："
@@ -1029,48 +1027,20 @@ msgstr "退出消�："
 msgid "Real name:"
 msgstr "真�："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "�务器"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "您的 IRC 昵称是什么?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "哪个 IRC 网络?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例如：</b>user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例如：</b>user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "需�加密(TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "忽略 SSL �书错误(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "覆盖�务器设置"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 昵称是什么?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "资�(_U)："
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 用户�是什么？"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1082,179 +1052,203 @@ msgstr ""
 "<b>badger</b>。如果您还没有 Facebook 用户�的�，使用<a href=\"http://www."
 "facebook.com/username/\">这个页�</a> �选择一个。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "使用旧的 SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "您的 Facebook 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "您的 Facebook 用户�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "您的 Google ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例如：</b>user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "您的 Google 密�是什么？"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例如：</b>user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL �书错误(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "资�(_U)："
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需�加密(TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "使用旧的 SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "覆盖�务器设置"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "您的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "您的 Jabber 密�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "您想�的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "您的 Jabber 密�是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "您想�的 Jabber 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例如：</b>user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "您的 Windows Live ��是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "您的 Windows Live 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "电�邮件地�(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "昵称(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L)："
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "�(_F)"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公开的�字(_P)："
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "姓(_L)："
+msgid "E-_mail address:"
+msgstr "电�邮件地�(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公开的�字(_P)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "用户�(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例如：</b>user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "验�用户�："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "�现绑定"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "自动�现 STUN �务器"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此��拨打固定电�和手机(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "忽略 TLS 错误"
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "间隔(秒)"
+msgid "Proxy Options"
+msgstr "代�选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive 选项"
+msgid "Miscellaneous Options"
+msgstr "�项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "宽�路由"
+msgid "STUN Server:"
+msgstr "STUN �务器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "机制："
+msgid "Discover the STUN server automatically"
+msgstr "自动�现 STUN �务器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "�项"
+msgid "Discover Binding"
+msgstr "�现绑定"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 选项"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "�务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "端�："
+msgid "Mechanism:"
+msgstr "机制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "代�选项"
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "验�用户�："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "传输："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN �务器："
+msgid "Loose Routing"
+msgstr "宽�路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "�务器："
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "传输："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "用此�户拨打固定电�和手机(_L)"
+msgid "Port:"
+msgstr "端�："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "您的 SIP ��密�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "您的 SIP 登录 ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "用户�(_U)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "您的 SIP ��密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_D："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "忽略会议和�天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "�天室列表 locale(_R)："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "您的 Yahoo! ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "您的 Yahoo! 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "�天室列表 locale(_R)："
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1292,87 +1286,87 @@ msgstr "所有文件"
 msgid "Click to enlarge"
 msgstr "�击以放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "�起呼�时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "选择的�系人�支�呼�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "选择的�系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "选择的�系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�支�在此会�上进行紧急呼�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用�余��足以支付此次通�"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "建立�人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "�支�在此会�上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您�能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s 是无效的�系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当�会�的所有消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当�对�的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<�天室ID>] [<原因>]：当�默认离开�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消�>]：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消�>：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当��务器上改�您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消�>：�当�对�中��一个动作消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1381,131 +1375,137 @@ msgstr ""
 "/say <消�>：�� <消�> 到当�对�。这是用���一个“/�开始的信�。例如：“/"
 "say /join 是用�加入一个新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�系人 ID>：显示一个�系人的信�"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支�的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅�用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "余��足，无法��消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��消�“%s�出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "��消�出错：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "余��足，无法��消�。 <a href='%s'>充值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "��到"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "无效�系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "消�太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "�题："
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "�题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "�题被 %s 设置为：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "未设置�题"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "添加“%s�到字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s�到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "�入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "��(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "获�最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1513,12 +1513,12 @@ msgstr "%s 已断开连接"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1526,17 +1526,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了�天室"
@@ -1546,17 +1546,17 @@ msgstr "%s 离开了�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在�� %s"
@@ -1564,90 +1564,90 @@ msgstr "%s 现在�� %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2847
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "是��存密�?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�试"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密�错误，请�试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密��护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "对�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "未知或无效的识别符"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "�系人�蔽暂时��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "�系人�蔽��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "无法�蔽�系人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "编辑�蔽的�系人"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "��："
 
@@ -1657,7 +1657,7 @@ msgstr "已�蔽的�系人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "删除"
@@ -1680,121 +1680,45 @@ msgstr "打开链接(_O)"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "编辑�系人信�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "个人信�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新建�系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�蔽 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "确定��蔽 %s 以阻止他�次�系您�？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "举报�系人滥用"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "以��决定(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "�蔽用户(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../libempathy-gtk/empathy-individual-menu.c:1558
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "添加�系人(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "�蔽�系人"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:789
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "�天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:881
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音频呼�(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:926
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "视频呼�(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:979
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "最近会�(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:1020
-msgid "Send File"
-msgstr "��文件"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1062
-msgid "Share My Desktop"
-msgstr "共享我的桌�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1125
-msgid "Infor_mation"
-msgstr "信�(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1316
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "邀请到此�天室"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1362
-msgid "_Invite to Chat Room"
-msgstr "邀请到�天室(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "以��决定(_L)"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1821,166 +1745,170 @@ msgstr "您的自我介�信�："
 msgid "Please let me see when you're online. Thanks!"
 msgstr "你在线时请让我知�，谢谢�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "频�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "邮政编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方���："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "�度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "无法�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1097
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "收�"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "个人详情"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "�系人详情"
 
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
@@ -2047,176 +1975,216 @@ msgstr "邮政"
 msgid "parcel"
 msgstr "邮件"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>�置</b>于(日期）\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "标识符："
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "别�："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "客户端信�"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "客户端："
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>�置</b>于(日期）\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "�系人详情"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "已��信�请求..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "标识符："
+msgid "Client Information"
+msgstr "客户端信�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "已��信�请求..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "�作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "客户端："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "组"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该�系人加入的群组。注�您�以选择多个群组，也�以�选择。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被�蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "以下用户无法被�蔽："
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "已绑定的�系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "选择�绑定的�系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新�系人预览"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在左侧列表中选中的�系人将被绑定在一起。"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "编辑�系人信�"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:148
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
-msgstr "选择�用于拨打电�的�户"
+msgstr "选择�用于拨打电�的��"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:316
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:383
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:385
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "家庭"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "�蔽�系人"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "�天(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:836
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1174
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼�(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼�(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "最近会�(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "��文件"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "共享我的桌�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "收�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 未安装"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "请安装 gnome-contacts �访问�系人详情。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "信�(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1200
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "绑定�系人(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "邀请到此�天室"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2362
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "邀请到�天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "添加�系人(_A)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "删除并�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的�删除群组“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "删除群组"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2455
-#: ../libempathy-gtk/empathy-individual-view.c:2672
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2532
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想�删除�系人“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2541
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2224,11 +2192,11 @@ msgid ""
 msgstr ""
 "您是�真正地想�删除已绑定的�系人'%s' ？ 注�这将删除所有�系已绑定的�系人"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2553
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "删除�系人"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2238,23 +2206,23 @@ msgstr[0] "已绑定�系人包� %u �系人"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>�置</b> 于 (日期)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "通过电�或移动设备上网"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "选择一个 IRC 网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "�置_Networks列表"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "选择"
@@ -2267,308 +2235,246 @@ msgstr "新建�务器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "绑定�系人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "解除绑定(_U)..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全分离已显示的绑定的�系人�为�独的�系人"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "绑定(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "解除已绑定的�系人 %s？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"您确定您�接触这些已绑定的�系人？这将会完全拆分已绑定的�系人为�独的�系"
-"人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "解除绑定(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:621
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "历�"
 
-#: ../libempathy-gtk/empathy-log-window.c:676
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:698
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1149
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1199
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1288
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1294
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通�时长：%s，结�于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1723
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1738
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1826
-#: ../libempathy-gtk/empathy-log-window.c:3458
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "�时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1915
-#: ../libempathy-gtk/empathy-log-window.c:2371
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2684
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "è°�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2893
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3011
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文本�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3013
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3018
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "呼出的语音通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3020
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "未接�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定�删除以�的全部对�日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3762
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "从以下�置删除："
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">正在载入...</span>"
+msgid "_File"
+msgstr "文件(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�天"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "清空全部历�..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "个人信�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "视频"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "�天"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "视频"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
-#, fuzzy
-#| msgid "The specified contact is offline"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">正在载入...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "选择的�系人离线"
+msgstr "�系人为离线"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
-#, fuzzy
-#| msgid "The specified contact is not valid"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "选择的�系人无效"
+msgstr "指定的�系人无效或信�未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "选择的�系人�支�在该类型会�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "所�求的功能与此�议�兼容"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "无法与选择的�系人�起对�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "您已被此频��蔽"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "频�已满"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
-#, fuzzy
-#| msgid "You have been invited to join %s"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "您被邀请加入 %s"
+msgstr "您必须被邀请�能加入此频�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
-#, fuzzy
-#| msgid "Contact disconnected"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "�系人已断开"
+msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "���足"
+msgstr "拒�访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
-#, fuzzy
-#| msgid "There was an error starting the call"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "�起呼�时出错"
+msgstr "�起对�时出错"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "输入一个�系人标识或电���："
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新建对�"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "视频呼�(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "音频呼�(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新建通�"
 
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, fuzzy, c-format
-#| msgid "Authentication failed"
+#, c-format
 msgid "Authentification failed for account <b>%s</b>"
-msgstr "验�失败"
+msgstr "�� <b>%s</b> 验�失败"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
 #: ../libempathy-gtk/empathy-password-dialog.c:134
@@ -2598,11 +2504,11 @@ msgstr "编辑自定义消�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "点击移除自定义状�"
+msgstr "点击移除常用自定义状�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "点击设置自定义状�"
+msgstr "点击设置常用自定义状�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
@@ -2617,7 +2523,7 @@ msgstr "自定义消�..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s ��"
@@ -2627,20 +2533,20 @@ msgid "Find:"
 msgstr "查找："
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "区分大�写(_C)"
+msgid "_Previous"
+msgstr "上一页(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "未找到短语"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "下一页(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "区分大�写(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "上一页(_P)"
+msgid "Phrase not found"
+msgstr "未找到短语"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,14 +2590,14 @@ msgstr "语音通�结�"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "编辑自定义状�"
+msgstr "编辑自定义消�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "消�于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "普通"
 
@@ -2767,18 +2673,22 @@ msgid "Certificate hostname: %s"
 msgstr "�书主机�: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "继续"
+msgid "C_ontinue"
+msgstr "继续(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "��信任的连接"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "连接��信任。是���继续?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "为将�的连接记�本次选择"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "�书详情"
 
@@ -2973,31 +2883,31 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越�语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "无错误信�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "�时消�(Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "�动时�自动连接"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�动时�显示�系人列表"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Empathy �时通讯客户端"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "�系��管�器出错"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3039,11 +2949,11 @@ msgstr ""
 "给自由软件基金会写信。地�是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME �时消�客户端"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -3057,6 +2967,7 @@ msgstr ""
 "Tao Wei <weitao1979@gmail.com>, 2009\n"
 "Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
 "Tao Wang <dancefire@gmail.com>, 2010\n"
+"Mike Manilone <crtmike@gmail.com>, 2012\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
@@ -3067,231 +2978,105 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "导入��时�生错误。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "在解���详情时出现错误。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "在创建��时出现错误。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "�生错误。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "错误信�为：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您�以返回�试�新输入您的��信�，或者退出助�，然�从编辑��中加入�户。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
-msgid "An error occurred"
-msgstr "�生错误"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "您已�拥有哪个类型的��？"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还�设置其它�天���？"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "输入您的��详情"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "您想创建那�类型的��？"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "您想�创建其它的�天����"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "输入新��的详细资料"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"使用 Empathy，您�以与附近的朋��天，还�以与使用 Google Talk，AIM，Windows "
-"Live 和许多其它�天软件的朋�和�事�天。使用麦克风或摄�头，您就�以开始音频"
-"和视频通�。"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它�天软件的��？"
-
-#: ../src/empathy-account-assistant.c:653
-msgid "Yes, import my account details from "
-msgstr "有，请导入我的��信�"
-
-#: ../src/empathy-account-assistant.c:674
-msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的��信�"
-
-#: ../src/empathy-account-assistant.c:696
-msgid "No, I want a new account"
-msgstr "�，我想�一个新的��"
-
-#: ../src/empathy-account-assistant.c:706
-msgid "No, I just want to see people online nearby for now"
-msgstr "没有，我�是想看看附近现在�在线上"
-
-#: ../src/empathy-account-assistant.c:727
-msgid "Select the accounts you want to import:"
-msgstr "选择您�导入的��："
-
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:821
-msgid "No, that's all for now"
-msgstr "没有，就这样�"
-
-#: ../src/empathy-account-assistant.c:1086
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy �以自动�现和您连接到�一个网络中的人们，并且�以和他们�天。如果您"
-"想使用这个功能，请仔细查看下列信�是�正确。您之�也�以通过“���对�框轻�"
-"的修改这些信�或关闭这个功能"
-
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
-msgid "Edit->Accounts"
-msgstr "编辑->��"
-
-#: ../src/empathy-account-assistant.c:1108
-msgid "I do _not want to enable this feature for now"
-msgstr "暂��用此特性(_N)"
-
-#: ../src/empathy-account-assistant.c:1144
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"您无法�连接到您局域网中的用户�天，因为没有安装 telepathy-salut。如果您想�"
-"用该功能，请安装 telepathy-salut 包，并且在��对�框中创建附近的人(People "
-"Nearby)��"
-
-#: ../src/empathy-account-assistant.c:1150
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 未安装"
-
-#: ../src/empathy-account-assistant.c:1196
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "消�和 VoIP ��助手"
-
-#: ../src/empathy-account-assistant.c:1230
-msgid "Welcome to Empathy"
-msgstr "欢迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1239
-msgid "Import your existing accounts"
-msgstr "导入现有��"
-
-#: ../src/empathy-account-assistant.c:1257
-msgid "Please enter personal details"
-msgstr "请输入个人信�"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "您的 %s ��有未�存的修改。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "您的新��还没有�存。"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无�用网络"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知状�"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"因为此账户�赖一个旧���支�的�端，所以此账户已被�用。请安装 telepathy-"
+"haze 并�新�动您的会���移您的账户。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "离线 - ��被�用"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr "您将�创建一个新��，所�的修改将作废。您确定�继续�？"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "编辑连接�数"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "从�务器获�您的个人信�失败。"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "请上线以编辑您的个人信�。"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "编辑连接�数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "您�从电脑中移除 %s �？"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "这�会删除�务器上的��。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将�选择�一个��，所�的修改将作废。您确定�继续�？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "�用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "跳过(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3301,45 +3086,37 @@ msgstr "您将�关闭此窗�，所�的修改将作废。您确定�继续
 msgid "Add…"
 msgstr "添加..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "正在加载账�信�"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安装�议"
+msgid "_Import…"
+msgstr "导入(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "�议："
+msgid "Loading account information"
+msgstr "正在加载��信�"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "�添加一个新��，您首先需�为您想�使用的�个�议安装�端。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "导入(_I)..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "未安装�议�端"
 
-#: ../src/empathy-auth-client.c:284
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy 认�客户端"
 
-#: ../src/empathy-auth-client.c:300
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 认�客户端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3382,100 +3159,98 @@ msgstr "详细信�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通�"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "机器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上�务器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�一方所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中转�务器 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地�"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
-#, fuzzy
-#| msgid "Unknown"
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 软件无法�解您计算机所支�的任何音频格�。"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 软件无法�解您计算机所支�的任何视频格�。"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "�能与 %s 建立连接。�能是两�计算机之一��许直接连接。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的音频格�还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的视频格�还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3485,257 +3260,298 @@ msgstr ""
 "Telepathy 组件出现了一些�外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助�"
 "�里“调试�窗�收集到的日志。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "呼�引擎里出现了一个故障"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已到达�的末尾"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "�能建立音频�"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "�能建立视频�"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音频"
+msgid "_Call"
+msgstr "通�(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "解�器："
+msgid "_Microphone"
+msgstr "�筒(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "�用相机"
+msgid "_Camera"
+msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "显示拨�盘"
+msgid "_Settings"
+msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "编�器："
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "查看(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "挂起"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "挂起当�呼�"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "内容(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "本地候选："
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "最大化我"
+msgid "Swap camera"
+msgstr "交�相机"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "最�化我"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "远程候选："
+msgid "Maximise me"
+msgstr "最大化我"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "��音频"
+msgid "Disable camera"
+msgstr "�用相机"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "��视频"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "挂断"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "显示拨�盘"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "挂断当�呼�"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "视频呼�"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "开始视频通�"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "开始音频通�"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "交�相机"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "切�音频传输"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "切�视频传输"
+msgid "Show dialpad"
+msgstr "显示拨�盘"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "未知"
+msgid "Display the dialpad"
+msgstr "显示拨�盘"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "��视频"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "视频呼�"
+msgid "Toggle video transmission"
+msgstr "切�视频传输"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "通�(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "��音频"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "相机(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "内容(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "切�音频传输"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "调试(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "编�器："
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "解�器："
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "�筒(_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "远程候选："
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "设置(_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "本地候选："
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "查看(_V)"
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "关闭此窗�？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "关闭此窗�将离开 %s。您将�会�收到任何消�，除��新加入。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"关闭此窗�将离开 %u 间�天室。您将�会�收到任何消�，除��新加入。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "级别 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您将�会�收到�自此�天室的任何消�，除��新加入。"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "关闭窗�"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "离开�天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和�外 %u 人)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (�有他人的 %d �未读)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d �未读)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在�� %d �消�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "输入消�。"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+msgid "_Conversation"
+msgstr "对�(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "�系人(_O)"
+msgid "C_lear"
+msgstr "清除(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "�入表情(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "收��天室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "邀请�与者(_P)…"
+msgid "Notify for All Messages"
+msgstr "�示所有消�"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "显示�系人列表(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "�移标签(_R)"
+msgid "Invite _Participant…"
+msgstr "邀请�与者(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "�示所有消�"
+msgid "C_ontact"
+msgstr "�系人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "对�(_C)"
+msgid "_Tabs"
+msgstr "标签(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "收��天室(_F)"
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "显示�系人列表(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "左移标签(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "标签(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "�移标签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "撤销关闭标签(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3749,100 +3565,100 @@ msgstr "�天室"
 msgid "Auto-Connect"
 msgstr "自动连接"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "管��天室收�"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "呼入的视频通�"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "�电"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频�电。您想�接��？"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �电，您想�接��？"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的�电"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒�(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "使用视频接�(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s 的视频呼�"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "�天室邀请"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒�(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需�密�"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 当您在线的时候��"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3852,105 +3668,105 @@ msgstr ""
 "消�：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在� %2$s �� \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "� %2$s �� \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "��文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "已�从 %2$s 完�接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已�� %2$s 完��� \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "文件传�完�"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他�与者的回应"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩余"
 
@@ -3962,174 +3778,193 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完��已�消�已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "导入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到�导入的��。Empathy 目��能支�从 Pidgin 导入�户。"
+msgstr "未找到�导入的��。Empathy 目��能支�从 Pidgin 导入��。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "导入��"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "�议"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "�"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "�供密�"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "已断开连接"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需�设置一个���能查看这里的�系人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "没有找到匹�项"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "很抱歉，在软件 %2$s 更新�，您�能使用 %1$s �户。"
+msgstr "很抱歉，在软件 %2$s 更新�，您�能使用 %1$s ��。"
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "�级软件"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�新连接"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "编辑��"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
-msgstr "�户充值"
+msgstr "��充值"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "充值..."
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "�系人"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需��用一个���能查看这里的�系人。"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "您需��用 %s �查看这里的�系人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "�系人列表"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "�系人地图(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "��设置"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "�户余�"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对�(_N)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "在�系人列表中查找(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼�(_C)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "加入已收�的�天室(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "�索�系人(_S)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "管�收�夹"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "常规视图(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "离线�系人(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新建呼�(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "显示�议(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "扩展视图(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "��余�"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "�系人地图(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "��(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "已�蔽的�系人(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "首选项(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "显示�议(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "在�系人列表中查找(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "按姓�排�(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "按状�排�(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "��(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "扩展视图(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "已�蔽的�系人(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "常规视图(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "文件传输(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "�天室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新建对�(_N)..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "离线�系人(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "个人信�(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "�天室(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "加入已收�的�天室(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "�索�系人(_S)..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "管�收�夹"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4141,7 +3976,7 @@ msgstr "�员"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4154,22 +3989,27 @@ msgstr ""
 "需�密�: %s\n"
 "�员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "无法开始�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "无法�止�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "无法载入�天室列表"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "加入�天室"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4177,23 +4017,23 @@ msgid ""
 msgstr "输入�天室�以加入或在列表中点击一个或多个�天室。"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "�天室(_R)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr "输入�天室所在的�务器，或为空表示�天室在当���的�务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "加入�天室"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "无法载入�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "�天室(_R)："
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "收到了消�"
@@ -4207,12 +4047,12 @@ msgid "New conversation"
 msgstr "新对�"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "离线人上线"
+msgid "Contact comes online"
+msgstr "�系人上线了"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "�系人离线"
+msgstr "�系人离线了"
 
 #: ../src/empathy-preferences.c:171
 msgid "Account connected"
@@ -4227,367 +4067,390 @@ msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "朱立�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "朱立�已断开连接"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "首选项"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "显示表情符�为图形(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "在�天室显示�系人列表(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "行为"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "�天开始于："
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "�天主题(_E)："
+msgid "new ta_bs"
+msgstr "新标签(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时�用�示(_A)"
+msgid "new _windows"
+msgstr "新窗�(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时�用声音(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "��示区域显示呼入事件"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "�动时自动连接(_A) "
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"回声消除�以使您的语音在对方��更清晰，但在�些计算机上�能导致问题。如果您"
-"或对方在通�时�到了奇怪的噪音或怪音，请�试关闭回声消除并�新通�。"
+msgid "Log conversations"
+msgstr "记录对�"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "当�系人上线时�许�示"
+msgid "Behavior"
+msgstr "行为"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "当�系人离线时�许�示"
+msgid "General"
+msgstr "常规"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会�闲置时�许�示"
+msgid "_Enable bubble notifications"
+msgstr "�许气泡通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "�许拼写检查的语言："
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时�用�示(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "常规"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会�闲置时�许�示"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "当�系人上线时�许�示"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "�置��："
+msgid "Enable notifications when a contact goes offline"
+msgstr "当�系人离线时�许�示"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "记录对�"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "�示"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "�用声音通知(_E)"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "播放事件声音"
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时�用声音(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "��"
+msgid "Play sound for events"
+msgstr "播放事件声音"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"�低定�精度�味�比您所在的城市�州和国家更明确的信�将�会被公布。 GPS �标"
-"将精确到一��数。 "
+msgid "Sounds"
+msgstr "声音"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "显示表情符�为图形(_S)"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通�质�"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "在�天室显示�系人列表(_L)"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "声音"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "拼写检查"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除�以使您的语音在对方��更清晰，但在�些计算机上�能导致问题。如果您"
+"或对方在通�时�到了奇怪的噪音或怪音，请�试关闭回声消除并�新通�。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "语言列表仅�映已安装的字典"
+msgid "_Publish location to my contacts"
+msgstr "�我的�系人公布�置信�(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "主题"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "使用回声抑制，以改善通�质�"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"�低定�精度�味�比您所在的城市�州和国家更明确的信�将�会被公布。 GPS �标"
+"将精确到一��数。 "
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "版本："
+msgid "_Reduce location accuracy"
+msgstr "�低�置信�精度(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "�动时自动连接(_A) "
+msgid "Privacy"
+msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "手机(_C)"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "�许气泡通知(_E)"
+msgid "_Cellphone"
+msgstr "手机(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "�用声音通知(_E)"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "网络(_N)(IP，Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "�置��："
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在�独窗�中打开新�天(_O)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "语言列表仅�映已安装的字典"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "�我的�系人公布�置信�(_P)"
+msgid "Enable spell checking for languages:"
+msgstr "�许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "�低�置信�精度(_R)"
+msgid "Chat Th_eme:"
+msgstr "�天主题(_E)："
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "版本："
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "主题"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状�"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "�次呼��系人"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相机关闭"
+msgid "Redial"
+msgstr "�拨"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相机开�"
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "视频关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "�用相机�止��视频"
+msgid "Video Preview"
+msgstr "视频预览"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "�用相机，并��视频"
+msgid "Video On"
+msgstr "视频开�"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "�用相机，但���视频"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "�次呼��系人"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "预览"
+msgid "Camera Off"
+msgstr "相机关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "�拨"
+msgid "Disable camera and stop sending video"
+msgstr "�用相机�止��视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "视频(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "预览"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "视频关闭"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "�用相机，但���视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "视频开�"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "相机开�"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "视频预览"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "�用相机，并��视频"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "�系地图视图"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "�存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 链接"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin �应"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "一次粘贴的数�太多。请把日志�存到文件。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "调试窗�"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "��到 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暂�"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "信�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "消�"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "�急"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "已选定的连接管��支�远程调试扩展"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "邀请�与者"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个�系人以加入该会�："
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀请"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�显示任何对�框；完�所有工作（如导入）然�退出"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�有“附近的人���的时候�显示任何对�框"
 
 # lainme：�次选择给定的��(比如 gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "首先选择给定��(如 gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<�� ID>"
 
-#: ../src/empathy-accounts.c:196
-#, fuzzy
-#| msgid "Show the accounts dialog"
-msgid "Show account assistant"
-msgstr "显示��对�框"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy ��"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy ��"
 
@@ -4603,85 +4466,85 @@ msgstr "- Empathy 调试器"
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "�应"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接�"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以视频应答"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 刚刚�试呼�您，但您当时正在与其他人通�。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您当�的余�为 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "对�起，您信用�余��足以支付此次通�。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "充值"
 
@@ -4689,6 +4552,226 @@ msgstr "充值"
 msgid "_Match case"
 msgstr "区分大�写(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您已�拥有哪个类型的��？"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "添加新��"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy �以自动�现和您连接到�一个网络中的人们，并且�以和他们�天。如果您"
+"想使用这个功能，请仔细查看下列信�是�正确。"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"您�以在以�修改这些详细信�或通过在�系人列表中选择<span style=\"italic\">编"
+"辑 → ��</span>��用这一功能。"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "导入��时�生错误。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "在解���详情时出现错误。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "在创建��时出现错误。"
+
+#~ msgid "There was an error."
+#~ msgstr "�生错误。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "错误信�为：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您�以返回�试�新输入您的��信�，或者退出助�，然�从编辑��中加入�"
+#~ "�。"
+
+#~ msgid "An error occurred"
+#~ msgstr "�生错误"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您还�设置其它�天���？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "输入您的��详情"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想创建那�类型的��？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "您想�创建其它的�天����"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "输入新��的详细资料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy，您�以与附近的朋��天，还�以与使用 Google Talk，AIM，"
+#~ "Windows Live 和许多其它�天软件的朋�和�事�天。使用麦克风或摄�头，您就"
+#~ "�以开始音频和视频通�。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您有没有其它�天软件的��？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "有，请导入我的��信�"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "有，我现在就输入我的��信�"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�，我想�一个新的��"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "没有，我�是想看看附近现在�在线上"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "选择您�导入的��："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "没有，就这样�"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "编辑->��"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "暂��用此特性(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您无法�连接到您局域网中的用户�天，因为没有安装 telepathy-salut。如果您想"
+#~ "�用该功能，请安装 telepathy-salut 包，并且在��对�框中创建附近的人"
+#~ "(People Nearby)��"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut 未安装"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "消�和 VoIP ��助手"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "欢迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "导入现有��"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "请输入个人信�"
+
+#~ msgid "Protocol:"
+#~ msgstr "�议："
+
+#~ msgid "Show account assistant"
+#~ msgstr "显示��助手"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "�支� Socket 类型"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的网络��"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s ��通过 %s 进行了编辑。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s ��无法在 Empathy 中编辑。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "�动我的网络��"
+
+#~ msgid "Edit %s"
+#~ msgstr "编辑 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "�消(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "个人信�"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "已绑定的�系人"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "选择�绑定的�系人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新�系人预览"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在左侧列表中选中的�系人将被绑定在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "绑定�系人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "绑定�系人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "解除绑定(_U)..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全分离已显示的绑定的�系人�为�独的�系人"
+
+#~ msgid "_Link"
+#~ msgstr "绑定(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "解除已绑定的�系人 %s？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您确定您�接触这些已绑定的�系人？这将会完全拆分已绑定的�系人为�独的�系"
+#~ "人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "解除绑定(_U)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr "您将�创建一个新��，所�的修改将作废。您确定�继续�？"
+
+#~ msgid "_Personal Information"
+#~ msgstr "个人信�(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在�独窗�中打开新�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "�电音�"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 12ebb28c5..a983aded5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 20:23+0800\n"
+"POT-Creation-Date: 2012-03-05 21:23+0800\n"
+"PO-Revision-Date: 2012-03-05 21:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -35,6 +35,16 @@ msgstr "Empathy 互�網通訊"
 msgid "IM Client"
 msgstr "�時通用戶端"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管�訊�與 VoIP 帳號"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "訊�與 VoIP 帳號"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "永�為�個新的�天開啟新的�天視窗。"
@@ -169,303 +179,311 @@ msgid "Hide the main window."
 msgstr "隱�主視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "當你正輸入訊�給其他使用者時通知他們"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「�加�天室��話盒��的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "網�補齊字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "�使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果�天室使用的主題是 Adium 時�使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�出訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當�絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有�絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果�天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當�絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當�絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "通話時�影機�覽應該擺放的�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於�絡人清單內顯示餘�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "顯示�絡人羣組"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "在�天室顯示�絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "顯示離線�絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "顯示�定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的�設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次�擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "�天視窗�窗格的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�天視窗�窗格的儲存�置 (單�為�素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在�天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在�天視窗顯示談話的佈景主題樣�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "使用圖片�表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "在�天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的�絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是�使用 GPS 來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是�使用�動電話網絡來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是�使用網絡來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是�應在啟動時自動登入你的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是�應在使用者閒置時自動切�為離開模�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於�隱的�由減低�置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是�使用�絡人大頭貼�為�天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是�啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是�使用連線管�程�自動斷線或�新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是�以你設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是�將談話中的表情符號轉�為圖片形�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是��啟用 Pulseaudio 的回音消除�濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是�播放音效來通知有�絡人登入網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是�播放音效來通知有�絡人登出網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是�播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是�播放音效來通知有收到訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是�播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是�播放音效來通知有�出訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入�網絡時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出�網絡時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr "是��傳�「撰寫中�或「已中止�的�天狀態。若目�是「已離開�狀態則��影響。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當�絡人離線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當�絡人上線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊�時是�顯示彈出�通知 (�使已開啟�天視窗，但沒有�得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊�時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "是��在�絡人清單內顯示帳戶餘�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是�在�絡人清單與�天視窗顯示�絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是�在�絡人清單中顯示離線的�絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "是��在�絡人清單內顯示羣組。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是��在�絡人清單內顯示�絡人使用�定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是�在�天室中顯示�絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "是�以精簡模�顯示�絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是�在使用標題列的「x�按鈕關閉主視窗時，顯示訊��話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "是�為�天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr "排��絡人清單時�使用哪個準則。�設值是使用�絡人的�稱「name�(�稱) 值來排�。而「state�(狀態) 值則會使用其狀態來排��絡人清單。"
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管�訊�與 VoIP 帳號"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "訊�與 VoIP 帳號"
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr "排��絡人清單時�使用哪個準則。�設值是使用�絡人的狀態「state�(狀態) 值來排�。而「name�(�稱) 值則會根據據�稱來排��絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -491,7 +509,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -511,7 +529,7 @@ msgstr "��的檔案�是正�的檔案"
 msgid "The selected file is empty"
 msgstr "��的檔案是空白的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "�接 %s 的來電"
@@ -527,208 +545,212 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有�供證書"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "證書�被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "證書主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "此資�已連接至該伺�器"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "這個帳號已連接至伺�器"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器證書的長度，或是伺�器證書�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的軟件�舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�以�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �時以�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帳號"
 
@@ -746,30 +768,30 @@ msgstr "伺�器"
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者�稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺�器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在這個伺�器上建立新的帳號"
 
@@ -778,19 +800,19 @@ msgstr "在這個伺�器上建立新的帳號"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1241,217 +1263,223 @@ msgstr "所有檔案"
 msgid "Click to enlarge"
 msgstr "請按這�放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "指定的�絡人�支�通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "指定的�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "指定的�絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "你的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "你�被�許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的�絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網�>：更改在目�伺�器上的你的網�"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳�訊�時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "無效的�絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s 將主題設定為：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s�至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1459,12 +1487,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1472,17 +1500,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1492,17 +1520,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1510,55 +1538,55 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "你想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1603,7 +1631,7 @@ msgstr "被�鎖的�絡人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "移除"
@@ -1626,33 +1654,29 @@ msgstr "開啟連�(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資料"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增�絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "你確定想��鎖「%s�讓他無法�與你�絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1850,6 +1874,16 @@ msgstr "儲存大頭貼"
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "個人細節"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "�絡人詳細資料"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全�"
@@ -1933,11 +1967,6 @@ msgstr "用戶端資訊"
 msgid "Client:"
 msgstr "用戶端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "�絡人詳細資料"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1958,27 +1987,27 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "請�擇這個�絡人�顯�在哪個羣組。注�你�以�擇一個以上的羣組或��擇羣組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入羣組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "羣組"
 
@@ -1996,163 +2025,147 @@ msgstr[0] "下列識別身分無法被�鎖："
 msgid "Edit Contact Information"
 msgstr "編輯�絡人資訊"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "連��絡羣"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "���連�的�絡人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新增�絡人�覽"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在清單左方的所��絡人將連�在一起。"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "���用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "�動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "�家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "�鎖�絡人(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視�通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "傳�檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "分享我的桌�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 尚未安�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "請安� gnome-contacts 來存��絡人細節。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "連��絡人(_L)…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "邀請你到這個�天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除羣組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "正在移除羣組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除�絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr "你真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡羣的�絡人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "正在移除�絡人"
 
@@ -2195,174 +2208,133 @@ msgstr "新增伺�器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "連��絡人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "�消連�(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全將顯示的連��絡羣分散為�立的�絡人。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "連�(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "��消連��絡人「%s�的連�嗎？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr "你確定��消這些連��絡羣的連�？這會完全將連��絡羣分散為�立的�絡人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "�消連�(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "你確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2448,7 +2420,7 @@ msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入�絡人辨識身份或電話號碼："
 
@@ -2458,17 +2430,17 @@ msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "視�通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新增通話"
 
@@ -2524,7 +2496,7 @@ msgstr "自�訊�…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
@@ -2593,12 +2565,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自�訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2674,41 +2646,45 @@ msgid "Certificate hostname: %s"
 msgstr "證書主機�稱：%s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "繼續"
+msgid "C_ontinue"
+msgstr "繼續(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "未�信任的連線"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未�信任。你無論如何都�繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "請記�此�擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "證書詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需� %s 的空間以儲存此檔案，但僅有 %s �用。請�擇其他�置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2888,23 +2864,23 @@ msgstr "沒有錯誤訊�"
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示�絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2955,217 +2931,80 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "匯入帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "解�帳號詳細資料時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "建立帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "有錯誤發生。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "錯誤訊�為：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr "你�以回到���次輸入帳號的詳細資料或��此助�，�後�從「編輯��單加入帳號。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "你的�天帳號是哪一種？"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "你還想�設定其他的�天帳號嗎？"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "請輸入你的帳號詳細資料"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "你想�建立何種�天帳號？"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "是�想�建立其他�天帳號？"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "請輸入新帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr "使用 Empathy �以在網上跟附近的人�天，或是和使用 Google Talk�AIM�Windows Live 等其他�天程�的朋�和�事�天。利用麥克風或網絡�影機還�以進行語音或視�通話。"
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "你是�有使用其他�天程�的帳號？"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "是的，請匯入我的帳號詳細資料於"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "是的，我�在�輸入帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "�，我想�新的帳號"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "�，我�在�想看看附近有誰上線"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "�擇�匯入的帳號："
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "�，目�就這樣"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy �以自動探索與你連線到相�網絡上的人們，並且和他們�天。如果你想�使用此功能，請檢查下列詳細資料是�正確。你也�以在以後簡單地更改這些細節，或是用「帳號��話窗來�用此功能"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "編輯 -> 帳號"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "我�在�想�啟用這項功能(_N)"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr "你無法與連線到你本機網絡的人們�天，因為 telepathy-salut 尚未安�。如果你想�啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近的人�帳號"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 尚未安�"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "訊�與 VoIP 帳號助�"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "歡迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "匯入�有的帳號"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "請輸入個人詳細資料"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存你的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網絡連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr "這個帳已經�用，因為它需��舊����支�的後端程�。請安� telepathy-haze 並�新啟動你的作業階段來�移帳號資料。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺�器擷�你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線�數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是�想�從你的電腦上移除羣組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的你的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3174,15 +3013,23 @@ msgstr ""
 "你所�的更改。確定�繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "略�(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "連接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3199,20 +3046,16 @@ msgid "Loading account information"
 msgstr "正在載入帳號資訊"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安�通訊�定"
+msgid "No protocol backends installed"
+msgstr "尚未安�通訊�定後端程�"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "�定："
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "�加入新的帳號，你必須先安��個會用到的通訊�定後端程�。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
@@ -3224,15 +3067,11 @@ msgstr "- Empathy �證用戶端"
 msgid "Empathy authentication client"
 msgstr "Empathy �證用戶端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視�用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視�用戶端"
 
@@ -3275,98 +3114,98 @@ msgstr "詳細資料"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "互�網上的伺�器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多點廣播羣組的 IP ��"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟件�瞭解任何你電腦上所支�的音訊格�"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟件�瞭解任何你電腦上所支�的視�格�"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。你們其中之一�能在一個��許直接連線的網絡之上。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "這個網絡上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在你的電腦上安�"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視�格�尚未在你的電腦上安�"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3374,23 +3213,23 @@ msgid ""
 "the Help menu."
 msgstr "在 Telepathy 元件中發生未�期的狀�。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助�單內的「除錯�視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "無法建立視�串�"
 
@@ -3481,8 +3320,8 @@ msgstr "切�視�傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "�明"
 
@@ -3523,46 +3362,86 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "�關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %s。你將無法接收到之後的訊�，除�你�次�與。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] "關閉此視窗會離開 %u 個�天室。你將無法接收到之後的訊�，除�你�次�與。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "離開 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "你將無法接收到此�天室之後的訊�，除�你�次�與。"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "離開�天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3642,96 +3521,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管�喜好的�天室"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "傳入的視�通話"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �與你進行視�通話。你是��接�？"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與你進行通話。你是��接�？"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "以視�接�(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視�通話"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "�天室邀請"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請你�加 %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請你�加 %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "你被邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需�密碼"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想�得到查看你是�上線的許�"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3851,86 +3730,108 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完��已�消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找�到�匯入的帳號。Empathy 目��支�從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "你需�設置一個帳號�能在這�查看�絡人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "找�到符�項目"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除�你的 %s 軟件已更新。"
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "更新軟件..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "加值帳號存�"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "你需�啟用你其中之一的帳號之�能在這�查看�絡人。"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "你需�啟用 %s �能在這�查看�絡人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "�絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帳號設定值"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�絡人地圖(_M)"
@@ -4009,15 +3910,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線�絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資料(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "�天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)…"
 
@@ -4046,6 +3943,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�"
 
@@ -4097,7 +3999,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "�絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4117,46 +4019,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事�虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生�相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4256,51 +4158,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟�天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這�的語言清單��映出你已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話�質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的�天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "�我的�絡人公開�置(_P)"
@@ -4310,6 +4212,14 @@ msgstr "�我的�絡人公開�置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分�(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4370,63 +4280,84 @@ msgstr "視��覽"
 msgid "Contact Map View"
 msgstr "�絡人地圖檢視"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 連�"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 回應"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "�於單一貼上來說資料��大。請儲存紀錄至檔案。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "�錯視窗"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "傳�至 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暫�"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "�錯"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "訊�"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "嚴�"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4445,32 +4376,28 @@ msgstr "�擇想�邀請進入談話的�絡人："
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "��顯示任何�話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "��顯示任何�話窗，除��有「附近的人�帳號"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "�始��所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "顯示帳號助�"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
@@ -4486,85 +4413,85 @@ msgstr "- Empathy 除錯器"
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程�"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy �天用戶端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接�"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以視�接�"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛播打給你，但你正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "你目�的餘�為 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，你的存��足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "加值"
 
@@ -4572,10 +4499,188 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比�大�寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "你的�天帳號是哪一種？"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr "Empathy �以自動探索與你一�連線到相�網絡上的人們，並且和他們�天。如果你想使用此功能，請檢查下列詳細資料是�正確。"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "你�以�候更改這些細節，或藉由�擇「�絡人清單�中的 <span style=\"italic\">編輯 → 帳號</span> �用這個功能。"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "連��絡群"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "���連�的連絡人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新增連絡人�覽"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在清單左方的所��絡人將連�在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "連��絡人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "連��絡人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "�消連�(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全將顯示的連��絡群分散為�立的�絡人。"
+
+#~ msgid "_Link"
+#~ msgstr "連�(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "��消連��絡人「%s�的連�嗎？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您確定��消這些連��絡群的連�？這會完全將連��絡群分散為�立的�絡人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "�消連�(_U)"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "匯入帳號時發生錯誤。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "解�帳號詳細資料時發生錯誤。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "建立帳號時發生錯誤。"
+
+#~ msgid "There was an error."
+#~ msgstr "有錯誤發生。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "錯誤訊�為：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您�以回到���次輸入帳號的詳細資料或��此助�，�後�從「編輯��單加入"
+#~ "帳號。"
+
+#~ msgid "An error occurred"
+#~ msgstr "發生錯誤"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您還想�設定其他的�天帳號嗎？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "請輸入您的帳號詳細資料"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想�建立何種�天帳號？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "是�想�建立其他�天帳號？"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "請輸入新帳號的詳細資料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy �以在線上跟附近的人�天，或是和使用 Google Talk�AIM�"
+#~ "Windows Live 等其他�天程�的朋�和�事�天。利用麥克風或網路�影機還�以"
+#~ "進行語音或視訊通話。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您是�有使用其他�天程�的帳號？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "是的，請匯入我的帳號詳細資料於"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "是的，我�在�輸入帳號的詳細資料"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�，我想�新的帳號"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�，我�在�想看看附近有誰上線"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "�擇�匯入的帳號："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�，目�就這樣"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "編輯 -> 帳號"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "我�在�想�啟用這項功能(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您無法與連線到您本機網路的人們�天，因為 telepathy-salut 尚未安�。如果您"
+#~ "想�啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近"
+#~ "的人�帳號"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "訊�與 VoIP 帳號助�"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "歡迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "匯入�有的帳號"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "請輸入個人詳細資料"
+
+#~ msgid "Protocol:"
+#~ msgstr "�定："
+
+#~ msgid "Show account assistant"
+#~ msgstr "顯示帳號助�"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音�"
 
@@ -4839,8 +4944,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱�"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接�上�求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>�置</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 45ccd3b39..be634e497 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 00:38+0800\n"
+"POT-Creation-Date: 2012-03-05 21:23+0800\n"
+"PO-Revision-Date: 2012-03-05 19:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -35,6 +35,16 @@ msgstr "Empathy 網際網路通訊"
 msgid "IM Client"
 msgstr "�時通用戶端"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管�訊�與 VoIP 帳號"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "訊�與 VoIP 帳號"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "永�為�個新的�天開啟新的�天視窗。"
@@ -169,305 +179,315 @@ msgid "Hide the main window."
 msgstr "隱�主視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "當您正輸入訊�給其他使用者時通知他們"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「�加�天室��話盒��的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "�使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果�天室使用的主題是 Adium 時�使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�出訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果�天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "通話時�影機�覽應該擺放的�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於�絡人清單內顯示餘�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "顯示連絡人群組"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "在�天室顯示連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "顯示�定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的�設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次�擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "�天視窗�窗格的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�天視窗�窗格的儲存�置 (單�為�素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在�天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在�天視窗顯示談話的佈景主題樣�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "使用圖片�表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "在�天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是�使用 GPS 來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是�使用行動電話網路來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是�使用網路來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是�應在啟動時自動登入您的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是�應在使用者閒置時自動切�為離開模�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於隱�的�由減低�置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是�使用連絡人大頭貼�為�天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是�啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是�使用連線管�程�自動斷線或�新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是�以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是�將談話中的表情符號轉�為圖片形�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是��啟用 Pulseaudio 的回音消除�濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是�播放音效來通知有連絡人登入網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是�播放音效來通知有連絡人登出網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是�播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是�播放音效來通知有收到訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是�播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是�播放音效來通知有�出訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入�網路時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出�網路時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是��傳�「撰寫中�或「已中止�的�天狀態。若目�是「已離開�狀態則��影"
+"響。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊�時是�顯示彈出�通知 (�使已開啟�天視窗，但沒有�得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊�時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "是��在�絡人清單內顯示帳戶餘�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是�在連絡人清單與�天視窗顯示連絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是�在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "是��在�絡人清單內顯示群組。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是��在�絡人清單內顯示�絡人使用�定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是�在�天室中顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "是�以精簡模�顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是�在使用標題列的「x�按鈕關閉主視窗時，顯示訊��話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "是�為�天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"排�連絡人清單時�使用哪個準則。�設值是使用連絡人的�稱「name�(�稱) 值來排"
-"�。而「state�(狀態) 值則會使用其狀態來排�連絡人清單。"
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管�訊�與 VoIP 帳號"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "訊�與 VoIP 帳號"
+"排�連絡人清單時�使用哪個準則。�設值是使用連絡人的狀態「state�(狀態) 值來"
+"排�。而「name�(�稱) 值則會�據�稱來排�連絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -493,7 +513,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -513,7 +533,7 @@ msgstr "��的檔案�是正�的檔案"
 msgid "The selected file is empty"
 msgstr "��的檔案是空白的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "�接 %s 的來電"
@@ -529,208 +549,212 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有�供憑證"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "憑證�被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "此資�已連接至該伺�器"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "這個帳號已連接至伺�器"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器憑證的長度，或是伺�器憑證�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "您的軟體�舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�以�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �時以�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帳號"
 
@@ -748,30 +772,30 @@ msgstr "伺�器"
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者�稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺�器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在這個伺�器上建立新的帳號"
 
@@ -780,19 +804,19 @@ msgstr "在這個伺�器上建立新的帳號"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1244,87 +1268,87 @@ msgstr "所有檔案"
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "指定的�絡人�支�通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "指定的�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "指定的�絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "您的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您�被�許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目�伺�器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1333,11 +1357,11 @@ msgstr ""
 "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來"
 "說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1345,120 +1369,126 @@ msgstr ""
 "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳�訊�時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s 將主題設定為：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s�至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1466,12 +1496,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1479,17 +1509,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1499,17 +1529,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1517,55 +1547,55 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "您想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1610,7 +1640,7 @@ msgstr "被�鎖的�絡人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "移除"
@@ -1633,33 +1663,29 @@ msgstr "開啟連�(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "您確定想��鎖「%s�讓他無法�與您�絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1857,6 +1883,16 @@ msgstr "儲存大頭貼"
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "個人細節"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "連絡人詳細資料"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全�"
@@ -1940,11 +1976,6 @@ msgstr "用戶端資訊"
 msgid "Client:"
 msgstr "用戶端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "連絡人詳細資料"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1965,28 +1996,28 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "請�擇這個連絡人�顯�在哪個群組。注�您�以�擇一個以上的群組或��擇群組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "群組"
 
@@ -2004,156 +2035,140 @@ msgstr[0] "下列識別身分無法被�鎖："
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "連��絡群"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "���連�的連絡人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新增連絡人�覽"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在清單左方的所��絡人將連�在一起。"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "���用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "行動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "�家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "�鎖�絡人(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "傳�檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "分享我的桌�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 尚未安�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "請安� gnome-contacts 來存��絡人細節。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "連��絡人(_L)…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "邀請您到這個�天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除群組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "正在移除群組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除連絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2162,7 +2177,7 @@ msgstr ""
 "您真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡群的�絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
@@ -2205,175 +2220,133 @@ msgstr "新增伺�器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "連��絡人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "�消連�(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全將顯示的連��絡群分散為�立的�絡人。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "連�(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "��消連��絡人「%s�的連�嗎？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"您確定��消這些連��絡群的連�？這會完全將連��絡群分散為�立的�絡人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "�消連�(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "您確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2459,7 +2432,7 @@ msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入�絡人辨識身份或電話號碼："
 
@@ -2469,17 +2442,17 @@ msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新增通話"
 
@@ -2535,7 +2508,7 @@ msgstr "自訂訊�…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
@@ -2604,12 +2577,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2685,41 +2658,45 @@ msgid "Certificate hostname: %s"
 msgstr "憑證主機�稱：%s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "繼續"
+msgid "C_ontinue"
+msgstr "繼續(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "未�信任的連線"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未�信任。您無論如何都�繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "請記�此�擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "憑證詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需� %s 的空間以儲存此檔案，但僅有 %s �用。請�擇其他�置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2899,23 +2876,23 @@ msgstr "沒有錯誤訊�"
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示連絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2974,228 +2951,82 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "匯入帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "解�帳號詳細資料時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "建立帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "有錯誤發生。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "錯誤訊�為：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您�以回到���次輸入帳號的詳細資料或��此助�，�後�從「編輯��單加入帳"
-"號。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "您的�天帳號是哪一種？"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您還想�設定其他的�天帳號嗎？"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "請輸入您的帳號詳細資料"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "您想�建立何種�天帳號？"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "是�想�建立其他�天帳號？"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "請輸入新帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"使用 Empathy �以在線上跟附近的人�天，或是和使用 Google Talk�AIM�Windows "
-"Live 等其他�天程�的朋�和�事�天。利用麥克風或網路�影機還�以進行語音或視"
-"訊通話。"
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您是�有使用其他�天程�的帳號？"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "是的，請匯入我的帳號詳細資料於"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "是的，我�在�輸入帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "�，我想�新的帳號"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "�，我�在�想看看附近有誰上線"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "�擇�匯入的帳號："
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "�，目�就這樣"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy �以自動探索與您連線到相�網路上的人們，並且和他們�天。如果您想�使"
-"用此功能，請檢查下列詳細資料是�正確。您也�以在以後簡單地變更這些細節，或是"
-"用「帳號��話窗來�用此功能"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "編輯 -> 帳號"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "我�在�想�啟用這項功能(_N)"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"您無法與連線到您本機網路的人們�天，因為 telepathy-salut 尚未安�。如果您想�"
-"啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近的人�帳"
-"號"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 尚未安�"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "訊�與 VoIP 帳號助�"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "歡迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "匯入�有的帳號"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "請輸入個人詳細資料"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"這個帳已經�用，因為它需��舊����支�的後端程�。請安� telepathy-haze "
+"並�新啟動您的作業階段來�移帳號資料。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺�器擷�您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線�數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是�想�從您的電腦上移除群組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3204,15 +3035,23 @@ msgstr ""
 "您所�的變更。確定�繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "略�(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "連接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3229,20 +3068,16 @@ msgid "Loading account information"
 msgstr "正在載入帳號資訊"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安�通訊�定"
+msgid "No protocol backends installed"
+msgstr "尚未安�通訊�定後端程�"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "�定："
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "�加入新的帳號，您必須先安��個會用到的通訊�定後端程�。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
@@ -3254,15 +3089,11 @@ msgstr "- Empathy �證用戶端"
 msgid "Empathy authentication client"
 msgstr "Empathy �證用戶端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視訊用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視訊用戶端"
 
@@ -3305,98 +3136,98 @@ msgstr "詳細資料"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網際網路上的伺�器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多點廣播群組的 IP ��"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟體�瞭解任何您電腦上所支�的音訊格�"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟體�瞭解任何您電腦上所支�的視訊格�"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。您們其中之一�能在一個��許直接連線的網路之上。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在您的電腦上安�"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視訊格�尚未在您的電腦上安�"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3406,23 +3237,23 @@ msgstr ""
 "在 Telepathy 元件中發生未�期的狀�。請<a href=\"%s\">回報這個錯誤</a>並附上"
 "從求助�單內的「除錯�視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串�"
 
@@ -3513,8 +3344,8 @@ msgstr "切�視訊傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "�明"
 
@@ -3555,46 +3386,87 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "�關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %s。您將無法接收到之後的訊�，除�您�次�與。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"關閉此視窗會離開 %u 個�天室。您將無法接收到之後的訊�，除�您�次�與。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "離開 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您將無法接收到此�天室之後的訊�，除�您�次�與。"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "離開�天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3674,96 +3546,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管�喜好的�天室"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �與您進行視訊通話。您是��接�？"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與您進行通話。您是��接�？"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "以視訊接�(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視訊通話"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "�天室邀請"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您�加 %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您�加 %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需�密碼"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想�得到查看您是�上線的許�"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3883,86 +3755,108 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完��已�消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找�到�匯入的帳號。Empathy 目��支�從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需�設置一個帳號�能在這裡查看�絡人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "找�到符�項目"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除�您的 %s 軟體已更新。"
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "更新軟體..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "加值帳號存�"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需�啟用您其中之一的帳號之�能在這裡查看�絡人。"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "您需�啟用 %s �能在這裡查看�絡人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "連絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帳號設定值"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "連絡人地圖(_M)"
@@ -4041,15 +3935,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線連絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資訊(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "�天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)…"
 
@@ -4078,6 +3968,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�"
 
@@ -4130,7 +4025,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "連絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4150,46 +4045,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事�虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生�相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4294,51 +4189,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟�天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單��映出您已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話�質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的�天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "�我的連絡人公開�置(_P)"
@@ -4348,6 +4243,14 @@ msgstr "�我的連絡人公開�置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分�(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4408,63 +4311,84 @@ msgstr "視訊�覽"
 msgid "Contact Map View"
 msgstr "連絡人地圖檢視"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 連�"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 回應"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "�於單一貼上來說資料��大。請儲存紀錄至檔案。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "�錯視窗"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "傳�至 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暫�"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "�錯"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "訊�"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "嚴�"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4483,32 +4407,28 @@ msgstr "�擇想�邀請進入談話的�絡人："
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "��顯示任何�話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "��顯示任何�話窗，除��有「附近的人�帳號"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "�始��所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "顯示帳號助�"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
@@ -4524,85 +4444,85 @@ msgstr "- Empathy 除錯器"
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程�"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy �天用戶端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接�"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以視訊接�"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛播打給您，但您正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您目�的餘�為 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，您的存��足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "加值"
 
@@ -4610,10 +4530,192 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比�大�寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您的�天帳號是哪一種？"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy �以自動探索與您一�連線到相�網路上的人們，並且和他們�天。如果您想"
+"使用此功能，請檢查下列詳細資料是�正確。"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"您�以�候變更這些細節，或藉由�擇「�絡人清單�中的 <span style=\"italic\">"
+"編輯 → 帳號</span> �用這個功能。"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "連��絡群"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "���連�的連絡人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新增連絡人�覽"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在清單左方的所��絡人將連�在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "連��絡人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "連��絡人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "�消連�(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全將顯示的連��絡群分散為�立的�絡人。"
+
+#~ msgid "_Link"
+#~ msgstr "連�(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "��消連��絡人「%s�的連�嗎？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您確定��消這些連��絡群的連�？這會完全將連��絡群分散為�立的�絡人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "�消連�(_U)"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "匯入帳號時發生錯誤。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "解�帳號詳細資料時發生錯誤。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "建立帳號時發生錯誤。"
+
+#~ msgid "There was an error."
+#~ msgstr "有錯誤發生。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "錯誤訊�為：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您�以回到���次輸入帳號的詳細資料或��此助�，�後�從「編輯��單加入"
+#~ "帳號。"
+
+#~ msgid "An error occurred"
+#~ msgstr "發生錯誤"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您還想�設定其他的�天帳號嗎？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "請輸入您的帳號詳細資料"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想�建立何種�天帳號？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "是�想�建立其他�天帳號？"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "請輸入新帳號的詳細資料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy �以在線上跟附近的人�天，或是和使用 Google Talk�AIM�"
+#~ "Windows Live 等其他�天程�的朋�和�事�天。利用麥克風或網路�影機還�以"
+#~ "進行語音或視訊通話。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您是�有使用其他�天程�的帳號？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "是的，請匯入我的帳號詳細資料於"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "是的，我�在�輸入帳號的詳細資料"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�，我想�新的帳號"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�，我�在�想看看附近有誰上線"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "�擇�匯入的帳號："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�，目�就這樣"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "編輯 -> 帳號"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "我�在�想�啟用這項功能(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您無法與連線到您本機網路的人們�天，因為 telepathy-salut 尚未安�。如果您"
+#~ "想�啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近"
+#~ "的人�帳號"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "訊�與 VoIP 帳號助�"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "歡迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "匯入�有的帳號"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "請輸入個人詳細資料"
+
+#~ msgid "Protocol:"
+#~ msgstr "�定："
+
+#~ msgid "Show account assistant"
+#~ msgstr "顯示帳號助�"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音�"
 
@@ -4877,8 +4979,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱�"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接�上�求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>�置</b>"
diff --git a/src/Makefile.am b/src/Makefile.am
index 06eaf1733..dfde20558 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
-	$(YELL_CFLAGS)					\
 	$(EMPATHY_CFLAGS)				\
 	$(EDS_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
@@ -24,7 +23,6 @@ LDADD =								\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(GCR_LIBS) 						\
 	$(EMPATHY_LIBS)						\
-	$(YELL_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(NULL)
 
@@ -32,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			\
@@ -56,7 +52,7 @@ bin_PROGRAMS =			\
 
 libexec_PROGRAMS = \
 	empathy-auth-client \
-	empathy-av \
+	empathy-call \
 	empathy-chat
 
 empathy_accounts_SOURCES =						\
@@ -73,6 +69,7 @@ empathy_debugger_SOURCES =						\
 	empathy-debugger.c		 				\
 	$(NULL)
 
+if HAVE_EMPATHY_AV
 empathy_av_SOURCES = \
 	empathy-av.c \
 	empathy-audio-sink.c \
@@ -100,7 +97,12 @@ empathy_av_SOURCES = \
 empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
 empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM)
 
+libexec_PROGRAMS += empathy-av
+
+endif
+
 empathy_auth_client_SOURCES =						\
+	empathy-sanity-cleaning.c empathy-sanity-cleaning.h \
 	empathy-auth-client.c \
 	$(NULL)
 
@@ -113,10 +115,6 @@ empathy_chat_SOURCES =						\
 	gedit-close-button.c gedit-close-button.h \
 	$(NULL)
 
-if HAVE_CALL
-
-libexec_PROGRAMS += empathy-call
-
 empathy_call_SOURCES = \
        empathy-call.c \
        empathy-call-factory.c \
@@ -139,8 +137,6 @@ empathy_call_SOURCES = \
        empathy-video-widget.h \
        empathy-preferences.c \
        empathy-preferences.h \
-       ev-sidebar.c \
-       ev-sidebar.h \
        empathy-camera-menu.c \
        empathy-camera-menu.h \
        empathy-mic-menu.c \
@@ -157,8 +153,6 @@ empathy_call_SOURCES = \
 empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
-endif
-
 empathy_handwritten_source = \
 	empathy-about-dialog.c empathy-about-dialog.h			\
 	empathy-chat-window.c empathy-chat-window.h			\
@@ -192,7 +186,12 @@ empathy_LDADD =								\
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES) \
-    $(empathy_handwritten_av_source)
+    $(libempathy_accounts_common_la_SOURCES) \
+    $(empathy_accounts_SOURCES) \
+    $(empathy_debugger_SOURCES) \
+    $(empathy_auth_client_SOURCES) \
+    $(empathy_chat_SOURCES) \
+    $(empathy_call_SOURCES)
 
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
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..189f22b58 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -41,6 +41,7 @@
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-connectivity.h>
+#include <libempathy/empathy-pkg-kit.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -51,8 +52,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 +81,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 +95,6 @@ typedef struct {
   GtkWidget *image_status;
   GtkWidget *throbber;
   GtkWidget *enabled_switch;
-  GtkWidget *frame_no_protocol;
 
   GtkWidget *treeview;
 
@@ -99,8 +102,6 @@ typedef struct {
   GtkWidget *button_remove;
   GtkWidget *button_import;
 
-  GtkWidget *hbox_protocol;
-
   GtkWidget *image_type;
   GtkWidget *label_name;
   GtkWidget *label_type;
@@ -161,21 +162,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 +213,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);
 }
 
@@ -267,6 +263,21 @@ accounts_dialog_enable_switch_active_cb (GtkSwitch *sw,
 }
 
 static void
+install_haze_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!empathy_pkg_kit_install_packages_finish  (result, &error))
+    {
+      DEBUG ("Failed to install telepathy-haze: %s", error->message);
+
+      g_error_free (error);
+    }
+}
+
+static void
 accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
     TpAccount *account)
 {
@@ -283,6 +294,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
   gboolean                  account_enabled;
   gboolean                  creating_account;
   TpStorageRestrictionFlags storage_restrictions = 0;
+  gboolean display_switch = TRUE;
 
   view = GTK_TREE_VIEW (priv->treeview);
   selection = gtk_tree_view_get_selection (view);
@@ -319,6 +331,13 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
         presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
 
       storage_restrictions = tp_account_get_storage_restrictions (account);
+      if (storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED)
+        display_switch = FALSE;
+
+      /* Butterfly accounts shouldn't be used any more */
+      if (!tp_strdiff (tp_account_get_connection_manager (account),
+            "butterfly"))
+        display_switch = FALSE;
     }
   else
     {
@@ -340,8 +359,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
       accounts_dialog_enable_switch_active_cb, dialog);
 
   /* Display the Enable switch if account supports it */
-  gtk_widget_set_visible (priv->enabled_switch,
-      !(storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED));
+  gtk_widget_set_visible (priv->enabled_switch, display_switch);
 
   if (account_enabled)
     {
@@ -431,8 +449,24 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
     }
   else
     {
-      accounts_dialog_status_infobar_set_message (dialog,
-          _("Offline — Account Disabled"));
+      if (!tp_strdiff (tp_account_get_connection_manager (account),
+            "butterfly"))
+        {
+          const gchar *packages[] = { "telepathy-haze", NULL };
+
+          accounts_dialog_status_infobar_set_message (dialog,
+              _("This account has been disabled because it relies on an old, "
+                "unsupported backend. Please install telepathy-haze and "
+                "restart your session to migrate the account."));
+
+          empathy_pkg_kit_install_packages_async (0, packages, NULL, NULL,
+              install_haze_cb, NULL);
+        }
+      else
+        {
+          accounts_dialog_status_infobar_set_message (dialog,
+              _("Offline — Account Disabled"));
+        }
 
       gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
           GTK_MESSAGE_WARNING);
@@ -534,6 +568,8 @@ account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
   GtkWidget *subdialog, *content, *content_area, *align;
 
   settings = accounts_dialog_model_get_selected_settings (dialog);
+  if (settings == NULL)
+    return;
 
   subdialog = gtk_dialog_new_with_buttons (_("Edit Connection Parameters"),
       GTK_WINDOW (dialog),
@@ -667,6 +703,8 @@ account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
   TpStorageRestrictionFlags storage_restrictions;
 
   settings = accounts_dialog_model_get_selected_settings (dialog);
+  if (settings == NULL)
+    return;
 
   account = empathy_account_settings_get_account (settings);
   g_return_if_fail (account != NULL);
@@ -940,12 +978,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 +1026,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 +1618,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 +1635,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 +1676,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 +1779,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 +1902,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 +1910,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 +1961,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 +2045,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 +2098,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 +2197,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 +2341,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 +2354,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 +2435,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-audio-sink.c b/src/empathy-audio-sink.c
index fbffa4885..2968fb53c 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -355,6 +355,8 @@ empathy_audio_sink_request_new_pad (GstElement *element,
     goto error;
 
   subpad = gst_ghost_pad_new ("sink", filterpad);
+  gst_object_unref (filterpad);
+
   if (!gst_element_add_pad (GST_ELEMENT (bin), subpad))
     goto error;
 
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 22a625229..ecf1ad173 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -41,6 +41,8 @@
 #include <libempathy-gtk/empathy-tls-dialog.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
+#include "empathy-sanity-cleaning.h"
+
 #include <gnutls/gnutls.h>
 
 #include <extensions/extensions.h>
@@ -351,6 +353,7 @@ main (int argc,
     }
 
   start_timer ();
+  empathy_sanity_checking_run_if_needed ();
 
   gtk_main ();
 
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-factory.c b/src/empathy-call-factory.c
index b3c85f4b0..95c828d94 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.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>
@@ -27,8 +28,6 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-tp-contact-factory.h>
@@ -76,39 +75,41 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
 
   tp_base_client_take_approver_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
           G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
 
   tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
           G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
 
   tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
           G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-        TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
+        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
         NULL));
 
   tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
           G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-        TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
+        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
         NULL));
 
   tp_base_client_add_handler_capabilities_varargs (client,
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp",
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p",
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264",
-    NULL);
+      "org.freedesktop.Telepathy.Channel.Type.Call1/audio",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/video",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/ice",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/video/h264",
+      NULL);
 }
 
 static GObject *
@@ -151,7 +152,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       NULL, NULL,
       g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
-      4, G_TYPE_UINT, TPY_TYPE_CALL_CHANNEL,
+      4, G_TYPE_UINT, TP_TYPE_CALL_CHANNEL,
       TP_TYPE_CHANNEL_DISPATCH_OPERATION,
       TP_TYPE_ADD_DISPATCH_OPERATION_CONTEXT);
 }
@@ -189,66 +190,6 @@ empathy_call_factory_get (void)
 }
 
 static void
-call_channel_got_contact (TpConnection *connection,
-  EmpathyContact *contact,
-  const GError *error,
-  gpointer user_data,
-  GObject *weak_object)
-{
-  EmpathyCallFactory *factory = EMPATHY_CALL_FACTORY (weak_object);
-  EmpathyCallHandler *handler;
-  TpyCallChannel *call = TPY_CALL_CHANNEL (user_data);
-
-  if (contact == NULL)
-    {
-      /* FIXME use hangup with an appropriate error */
-      tp_channel_close_async (TP_CHANNEL (call), NULL, NULL);
-      return;
-    }
-
-  handler = empathy_call_handler_new_for_channel (call, contact);
-
-  g_signal_emit (factory, signals[NEW_CALL_HANDLER], 0,
-    handler, FALSE);
-
-  g_object_unref (handler);
-}
-
-static void
-call_channel_ready (EmpathyCallFactory *factory,
-  TpyCallChannel *call)
-{
-  TpChannel *channel = TP_CHANNEL (call);
-  const gchar *id;
-
-  id = tp_channel_get_identifier (channel);
-
-  /* The ready callback has a reference, so pass that on */
-  empathy_tp_contact_factory_get_from_id (
-    tp_channel_borrow_connection (channel),
-    id,
-    call_channel_got_contact,
-    channel,
-    g_object_unref,
-    (GObject *) factory);
-}
-
-static void
-call_channel_ready_cb (TpyCallChannel *call,
-  GParamSpec *spec,
-  EmpathyCallFactory *factory)
-{
-  gboolean ready;
-
-  g_object_get (call, "ready", &ready, NULL);
-  if (!ready)
-    return;
-
-  call_channel_ready (factory, call);
-}
-
-
-static void
 handle_channels (TpBaseClient *client,
     TpAccount *account,
     TpConnection *connection,
@@ -263,36 +204,38 @@ handle_channels (TpBaseClient *client,
   for (l = channels; l != NULL; l = g_list_next (l))
     {
       TpChannel *channel = l->data;
-      TpyCallChannel *call;
-      gboolean ready;
+      TpCallChannel *call;
+      TpContact *tp_contact;
+      EmpathyContact *contact;
+      EmpathyCallHandler *handler;
 
       if (tp_proxy_get_invalidated (channel) != NULL)
         continue;
 
       if (tp_channel_get_channel_type_id (channel) !=
-          TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+          TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
         continue;
 
-      if (!TPY_IS_CALL_CHANNEL (channel))
+      if (!TP_IS_CALL_CHANNEL (channel))
         continue;
 
-      call = TPY_CALL_CHANNEL (channel);
+      call = TP_CALL_CHANNEL (channel);
+
+      tp_contact = tp_channel_get_target_contact (channel);
+      contact = empathy_contact_dup_from_tp_contact (tp_contact);
+      handler = empathy_call_handler_new_for_channel (call, contact);
 
-      /* Take a ref to keep while hopping through the async callbacks */
-      g_object_ref (call);
-      g_object_get (call, "ready", &ready, NULL);
+      g_signal_emit (self, signals[NEW_CALL_HANDLER], 0,
+          handler, FALSE);
 
-      if (!ready)
-        tp_g_signal_connect_object (call, "notify::ready",
-          G_CALLBACK (call_channel_ready_cb), self, 0);
-      else
-        call_channel_ready (self, call);
+      g_object_unref (handler);
+      g_object_unref (contact);
     }
 
   tp_handle_channels_context_accept (context);
 }
 
-static TpyCallChannel *
+static TpCallChannel *
 find_call_channel (GList *channels)
 {
   GList *l;
@@ -307,8 +250,8 @@ find_call_channel (GList *channels)
 
       channel_type = tp_channel_get_channel_type_id (channel);
 
-      if (channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
-        return TPY_CALL_CHANNEL (channel);
+      if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+        return TP_CALL_CHANNEL (channel);
     }
 
   return NULL;
@@ -323,7 +266,7 @@ approve_channels (TpBaseClient *client,
     TpAddDispatchOperationContext *context)
 {
   EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
-  TpyCallChannel *channel;
+  TpCallChannel *channel;
   guint handle;
   GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" };
   gboolean handled = FALSE;
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 4014ad6c6..33ae9c709 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.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>
@@ -26,8 +27,6 @@
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <telepathy-farstream/telepathy-farstream.h>
 
 #include <libempathy/empathy-utils.h>
@@ -63,7 +62,6 @@ enum {
   PROP_CALL_CHANNEL = 1,
   PROP_GST_BUS,
   PROP_CONTACT,
-  PROP_MEMBERS,
   PROP_INITIAL_AUDIO,
   PROP_INITIAL_VIDEO,
   PROP_SEND_AUDIO_CODEC,
@@ -79,11 +77,9 @@ enum {
 /* private structure */
 
 struct _EmpathyCallHandlerPriv {
-  TpyCallChannel *call;
+  TpCallChannel *call;
 
   EmpathyContact *contact;
-  /* GArray of TpContacts */
-  GArray *members;
   TfChannel *tfchannel;
   gboolean initial_audio;
   gboolean initial_video;
@@ -96,6 +92,7 @@ struct _EmpathyCallHandlerPriv {
   FsCandidate *video_remote_candidate;
   FsCandidate *audio_local_candidate;
   FsCandidate *video_local_candidate;
+  gboolean accept_when_initialised;
 };
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
@@ -109,8 +106,6 @@ empathy_call_handler_dispose (GObject *object)
   tp_clear_object (&priv->call);
   tp_clear_object (&priv->contact);
 
-  tp_clear_pointer (&priv->members, g_array_unref);
-
   G_OBJECT_CLASS (empathy_call_handler_parent_class)->dispose (object);
 }
 
@@ -141,36 +136,22 @@ empathy_call_handler_init (EmpathyCallHandler *obj)
 }
 
 static void
-on_get_contacts_cb (TpConnection *connection,
-    guint n_contacts,
-    EmpathyContact * const * contacts,
-    guint n_failed,
-    const TpHandle *failed,
-    const GError *error,
-    gpointer user_data,
-    GObject *weak_object)
+on_call_accepted_cb (GObject *source_object,
+    GAsyncResult *res,
+    gpointer user_data)
 {
-  EmpathyCallHandler *self = EMPATHY_CALL_HANDLER (weak_object);
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  guint i;
-
-  if (n_failed > 0)
-    g_warning ("Failed to get %d EmpathyContacts: %s",
-        n_failed, error->message);
-
-  priv->members = g_array_sized_new (FALSE, TRUE,
-      sizeof (EmpathyContact *), n_contacts);
-
-  for (i = 0; i < n_contacts; i++)
-    g_object_ref (contacts[i]);
-
-  g_array_append_vals (priv->members, contacts, n_contacts);
+  TpCallChannel *call = TP_CALL_CHANNEL (source_object);
+  GError *error = NULL;
 
-  g_object_notify (G_OBJECT (self), "members");
+  if (!tp_call_channel_accept_finish (call, res, &error))
+    {
+      g_warning ("could not accept Call: %s", error->message);
+      g_error_free (error);
+    }
 }
 
 static void
-on_call_invalidated_cb (TpyCallChannel *call,
+on_call_invalidated_cb (TpCallChannel *call,
     guint domain,
     gint code,
     gchar *message,
@@ -182,91 +163,43 @@ on_call_invalidated_cb (TpyCallChannel *call,
     {
       /* Invalidated unexpectedly? Fake call ending */
       g_signal_emit (self, signals[STATE_CHANGED], 0,
-          TPY_CALL_STATE_ENDED, NULL);
+          TP_CALL_STATE_ENDED, NULL);
+      priv->accept_when_initialised = FALSE;
       tp_clear_object (&priv->call);
       tp_clear_object (&priv->tfchannel);
     }
 }
 
 static void
-on_call_state_changed_cb (TpyCallChannel *call,
-  TpyCallState state,
-  TpyCallFlags flags,
-  const GValueArray *call_state_reason,
-  GHashTable *call_state_details,
+on_call_state_changed_cb (TpCallChannel *call,
+  TpCallState state,
+  TpCallFlags flags,
+  TpCallStateReason *reason,
+  GHashTable *details,
   EmpathyCallHandler *handler)
 {
   EmpathyCallHandlerPriv *priv = handler->priv;
-  gchar *dbus_reason;
-  guint actor, reason;
 
-  tp_value_array_unpack ((GValueArray *) call_state_reason, 3,
-      &actor, &reason, &dbus_reason);
+  g_signal_emit (handler, signals[STATE_CHANGED], 0, state,
+      reason->dbus_reason);
 
-  g_signal_emit (handler, signals[STATE_CHANGED], 0, state, dbus_reason);
+  if (state == TP_CALL_STATE_INITIALISED &&
+      priv->accept_when_initialised)
+    {
+      tp_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL);
+      priv->accept_when_initialised = FALSE;
+    }
 
-  if (state == TPY_CALL_STATE_ENDED)
+  if (state == TP_CALL_STATE_ENDED)
     {
       tp_channel_close_async (TP_CHANNEL (call), NULL, NULL);
-
+      priv->accept_when_initialised = FALSE;
       tp_clear_object (&priv->call);
       tp_clear_object (&priv->tfchannel);
     }
 }
 
 static void
-on_members_changed_cb (TpyCallChannel *call,
-    GHashTable *members,
-    EmpathyCallHandler *self)
-{
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-  GHashTableIter iter;
-  gpointer key, value;
-  TpHandle *handles;
-  guint n_handles;
-  guint i = 0;
-
-  if (members == NULL)
-    return;
-
-  n_handles = g_hash_table_size (members);
-  if (n_handles == 0)
-    return;
-
-  handles = g_new0 (TpHandle, n_handles);
-
-  g_hash_table_iter_init (&iter, members);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    handles[i++] = GPOINTER_TO_UINT (key);
-
-  empathy_tp_contact_factory_get_from_handles (
-      tp_channel_borrow_connection (TP_CHANNEL (priv->call)),
-      n_handles, handles,
-      on_get_contacts_cb,
-      NULL, NULL, G_OBJECT (self));
-
-  g_free (handles);
-}
-
-static void
-empathy_call_handler_constructed (GObject *object)
-{
-  EmpathyCallHandler *self = EMPATHY_CALL_HANDLER (object);
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-//  GHashTable *members;
-
-  g_signal_connect (priv->call, "members-changed",
-      G_CALLBACK (on_members_changed_cb), object);
-
-/* FIXME
-  g_object_get (priv->call, "members", &members, NULL);
-
-  if (members)
-    on_members_changed_cb (priv->call, members, self);
-*/
-}
-
-static void
 empathy_call_handler_set_property (GObject *object,
   guint property_id, const GValue *value, GParamSpec *pspec)
 {
@@ -277,9 +210,6 @@ empathy_call_handler_set_property (GObject *object,
       case PROP_CONTACT:
         priv->contact = g_value_dup_object (value);
         break;
-      case PROP_MEMBERS:
-        priv->members = g_value_get_boxed (value);
-        break;
       case PROP_CALL_CHANNEL:
         g_return_if_fail (priv->call == NULL);
 
@@ -312,9 +242,6 @@ empathy_call_handler_get_property (GObject *object,
       case PROP_CONTACT:
         g_value_set_object (value, priv->contact);
         break;
-      case PROP_MEMBERS:
-        g_value_set_boxed (value, priv->members);
-        break;
       case PROP_CALL_CHANNEL:
         g_value_set_object (value, priv->call);
         break;
@@ -362,7 +289,6 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
 
   g_type_class_add_private (klass, sizeof (EmpathyCallHandlerPriv));
 
-  object_class->constructed = empathy_call_handler_constructed;
   object_class->set_property = empathy_call_handler_set_property;
   object_class->get_property = empathy_call_handler_get_property;
   object_class->dispose = empathy_call_handler_dispose;
@@ -374,15 +300,9 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONTACT, param_spec);
 
-  param_spec = g_param_spec_boxed ("members",
-    "call members", "The call participants",
-    G_TYPE_ARRAY,
-    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_MEMBERS, param_spec);
-
   param_spec = g_param_spec_object ("call-channel",
     "call channel", "The call channel",
-    TPY_TYPE_CALL_CHANNEL,
+    TP_TYPE_CALL_CHANNEL,
     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CALL_CHANNEL, param_spec);
 
@@ -529,12 +449,12 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
 }
 
 EmpathyCallHandler *
-empathy_call_handler_new_for_channel (TpyCallChannel *call,
+empathy_call_handler_new_for_channel (TpCallChannel *call,
   EmpathyContact *contact)
 {
   return EMPATHY_CALL_HANDLER (g_object_new (EMPATHY_TYPE_CALL_HANDLER,
     "call-channel", call,
-    "initial-video", tpy_call_channel_has_initial_video (call),
+    "initial-video", tp_call_channel_has_initial_video (call, NULL),
     "target-contact", contact,
     NULL));
 }
@@ -748,8 +668,7 @@ src_pad_added_error_idle (gpointer data)
 {
   TfContent *content = data;
 
-  tf_content_error (content, 0 /* FIXME */,
-      "Could not link sink", NULL);
+  tf_content_error_literal (content, "Could not link sink");
   g_object_unref (content);
 
   return FALSE;
@@ -822,8 +741,7 @@ on_tf_channel_content_added_cb (TfChannel *tfchannel,
     content, &retval);
 
  if (!retval)
-      tf_content_error (content, 0 /* FIXME */,
-          "Could not link source", NULL);
+      tf_content_error_literal (content, "Could not link source");
 
  /* Get sending codec */
  g_object_get (content, "fs-session", &session, NULL);
@@ -891,8 +809,7 @@ on_tf_channel_content_removed_cb (TfChannel *tfchannel,
     {
       g_warning ("Could not remove content!");
 
-      tf_content_error (content, 0 /* FIXME */,
-          "Could not link source", NULL);
+      tf_content_error_literal (content, "Could not link source");
     }
 }
 
@@ -945,21 +862,6 @@ empathy_call_handler_start_tpfs (EmpathyCallHandler *self)
 }
 
 static void
-on_call_accepted_cb (GObject *source_object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  TpyCallChannel *call = TPY_CALL_CHANNEL (source_object);
-  GError *error = NULL;
-
-  if (!tpy_call_channel_accept_finish (call, res, &error))
-    {
-      g_warning ("could not accept Call: %s", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
 empathy_call_handler_request_cb (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
@@ -979,13 +881,13 @@ empathy_call_handler_request_cb (GObject *source,
       return;
     }
 
-  if (!TPY_IS_CALL_CHANNEL (channel))
+  if (!TP_IS_CALL_CHANNEL (channel))
     {
       DEBUG ("The channel is not a Call channel!");
       return;
     }
 
-  priv->call = TPY_CALL_CHANNEL (channel);
+  priv->call = TP_CALL_CHANNEL (channel);
   tp_g_signal_connect_object (priv->call, "state-changed",
     G_CALLBACK (on_call_state_changed_cb), self, 0);
   tp_g_signal_connect_object (priv->call, "invalidated",
@@ -994,7 +896,7 @@ empathy_call_handler_request_cb (GObject *source,
   g_object_notify (G_OBJECT (self), "call-channel");
 
   empathy_call_handler_start_tpfs (self);
-  tpy_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL);
+  tp_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL);
 }
 
 void
@@ -1009,11 +911,28 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler,
   if (priv->call != NULL)
     {
       empathy_call_handler_start_tpfs (handler);
-      tpy_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL);
+
+      if (tp_channel_get_requested (TP_CHANNEL (priv->call)))
+        {
+          /* accept outgoing channels immediately */
+          tp_call_channel_accept_async (priv->call,
+              on_call_accepted_cb, NULL);
+        }
+      else
+        {
+          /* accepting incoming channels when they are INITIALISED */
+          if (tp_call_channel_get_state (priv->call, NULL, NULL, NULL) ==
+              TP_CALL_STATE_INITIALISED)
+            tp_call_channel_accept_async (priv->call,
+                on_call_accepted_cb, NULL);
+          else
+            priv->accept_when_initialised = TRUE;
+        }
+
       return;
     }
 
-  /* No TpyCallChannel (we are redialing). Request a new call channel */
+  /* No TpCallChannel (we are redialing). Request a new call channel */
   g_assert (priv->contact != NULL);
 
   account = empathy_contact_get_account (priv->contact);
@@ -1043,13 +962,9 @@ empathy_call_handler_stop_call (EmpathyCallHandler *handler)
 
   if (priv->call != NULL)
     {
-      tpy_call_channel_hangup_async (priv->call,
-          TPY_CALL_STATE_CHANGE_REASON_USER_REQUESTED,
+      tp_call_channel_hangup_async (priv->call,
+          TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED,
           "", "", NULL, NULL);
-      tp_channel_close_async (TP_CHANNEL (priv->call),
-        NULL, NULL);
-      tp_clear_object (&priv->call);
-      tp_clear_object (&priv->tfchannel);
     }
 }
 
@@ -1137,3 +1052,9 @@ empathy_call_handler_get_video_local_candidate (
 
   return priv->video_local_candidate;
 }
+
+EmpathyContact *
+empathy_call_handler_get_contact (EmpathyCallHandler *self)
+{
+  return self->priv->contact;
+}
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 330d368a5..36c6cfdc2 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -24,9 +24,9 @@
 #include <glib-object.h>
 
 #include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <farstream/fs-conference.h>
 
-#include <telepathy-yell/telepathy-yell.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-contact.h>
 
@@ -68,7 +68,7 @@ EmpathyCallHandler * empathy_call_handler_new_for_contact (
   EmpathyContact *contact);
 
 EmpathyCallHandler * empathy_call_handler_new_for_channel (
-  TpyCallChannel *call,
+  TpCallChannel *call,
   EmpathyContact *contact);
 
 void empathy_call_handler_start_call (EmpathyCallHandler *handler,
@@ -104,6 +104,8 @@ FsCandidate * empathy_call_handler_get_video_remote_candidate (
 FsCandidate * empathy_call_handler_get_video_local_candidate (
     EmpathyCallHandler *self);
 
+EmpathyContact * empathy_call_handler_get_contact (EmpathyCallHandler *self);
+
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_CALL_HANDLER_H__*/
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 0fecbdca6..2019cd02f 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -24,8 +24,6 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libnotify/notification.h>
 
 #include <libempathy/empathy-utils.h>
@@ -185,7 +183,7 @@ find_main_channel (GList *channels)
       channel_type = tp_channel_get_channel_type_id (channel);
 
       if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
-          channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+          channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
         return channel;
     }
 
@@ -203,9 +201,9 @@ has_ongoing_calls (EmpathyCallObserver *self)
       GQuark type = tp_channel_get_channel_type_id (channel);
 
       /* Check that Call channels are not ended */
-      if (type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL &&
-          tpy_call_channel_get_state (TPY_CALL_CHANNEL (channel), NULL, NULL)
-               == TPY_CALL_STATE_ENDED)
+      if (type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL &&
+          tp_call_channel_get_state (TP_CALL_CHANNEL (channel),
+              NULL, NULL, NULL) == TP_CALL_STATE_ENDED)
         continue;
 
       return TRUE;
@@ -372,7 +370,7 @@ empathy_call_observer_init (EmpathyCallObserver *self)
   tp_base_client_take_observer_filter (self->priv->observer,
       tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
           TP_HANDLE_TYPE_CONTACT,
         NULL));
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index a89d220c4..565c65d00 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -38,8 +38,8 @@
 #include <telepathy-farstream/telepathy-farstream.h>
 #include <telepathy-glib/util.h>
 
-#include <gst/farsight/fs-element-added-notifier.h>
-#include <gst/farsight/fs-utils.h>
+#include <farstream/fs-element-added-notifier.h>
+#include <farstream/fs-utils.h>
 
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-gsettings.h>
@@ -53,6 +53,7 @@
 #include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-images.h>
+#include <libempathy-gtk/empathy-call-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -78,7 +79,8 @@
 
 #define SELF_VIDEO_SECTION_WIDTH 120
 #define SELF_VIDEO_SECTION_HEIGHT 90
-#define SELF_VIDEO_SECTION_MARGIN 10
+#define SELF_VIDEO_SECTION_MARGIN 2
+#define SELF_VIDEO_SECTION_BORDER SELF_VIDEO_SECTION_MARGIN*2
 
 #define FLOATING_TOOLBAR_OPACITY 192
 #define FLOATING_TOOLBAR_WIDTH 280
@@ -99,6 +101,9 @@
 /* The time interval in milliseconds between 2 outgoing rings */
 #define MS_BETWEEN_RING 500
 
+/* The roundedness of preview box and placeholders */
+#define PREVIEW_ROUND_FACTOR 16
+
 G_DEFINE_TYPE(EmpathyCallWindow, empathy_call_window, GTK_TYPE_WINDOW)
 
 enum {
@@ -194,17 +199,13 @@ struct _EmpathyCallWindowPriv
   /* These are used to accept or reject an incoming call when the status
      is RINGING. */
   GtkWidget *incoming_call_dialog;
-  TpyCallChannel *pending_channel;
+  TpCallChannel *pending_channel;
   TpChannelDispatchOperation *pending_cdo;
   TpAddDispatchOperationContext *pending_context;
 
   gulong video_output_motion_handler_id;
   guint bus_message_source_id;
 
-  /* String that contains the queued tones to send after the current ones
-     are sent */
-  GString *tones;
-  gboolean sending_tones;
   GtkWidget *dtmf_panel;
 
   /* Details vbox */
@@ -347,60 +348,20 @@ empathy_call_window_video_call_cb (GtkToggleToolButton *button,
 }
 
 static void
-empathy_call_window_emit_tones (EmpathyCallWindow *self)
-{
-  TpChannel *channel;
-
-  if (tp_str_empty (self->priv->tones->str))
-    return;
-
-  g_object_get (self->priv->handler, "call-channel", &channel, NULL);
-
-  DEBUG ("Emitting multiple tones: %s", self->priv->tones->str);
-
-  tp_cli_channel_interface_dtmf_call_multiple_tones (channel, -1,
-      self->priv->tones->str,
-      NULL, NULL, NULL, NULL);
-
-  self->priv->sending_tones = TRUE;
-
-  g_string_set_size (self->priv->tones, 0);
-
-  g_object_unref (channel);
-}
-
-static void
-empathy_call_window_maybe_emit_tones (EmpathyCallWindow *self)
-{
-  if (self->priv->sending_tones)
-    return;
-
-  empathy_call_window_emit_tones (self);
-}
-
-static void
-empathy_call_window_tones_stopped_cb (TpChannel *proxy,
-    gboolean arg_cancelled,
-    gpointer user_data,
-    GObject *weak_object)
-{
-  EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
-
-  self->priv->sending_tones = FALSE;
-
-  empathy_call_window_emit_tones (self);
-}
-
-static void
 dtmf_start_tone_cb (EmpathyDialpadWidget *dialpad,
     TpDTMFEvent event,
     EmpathyCallWindow *self)
 {
-  EmpathyCallWindowPriv *priv = GET_PRIV (self);
+  TpCallChannel *call;
+  gchar tones[2];
+
+  g_object_get (self->priv->handler, "call-channel", &call, NULL);
 
-  g_string_append_c (priv->tones, tp_dtmf_event_to_char (event));
+  tones[0] = tp_dtmf_event_to_char (event);
+  tones[1] = '\0';
+  tp_call_channel_send_tones_async (call, tones, NULL, NULL, NULL);
 
-  empathy_call_window_maybe_emit_tones (self);
+  g_object_unref (call);
 }
 
 static void
@@ -439,8 +400,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);
@@ -670,7 +634,7 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
     ClutterBinAlignment y)
 {
   ClutterLayoutManager *layout1, *layout2;
-  ClutterActor *rectangle;
+  EmpathyRoundedRectangle *rectangle;
   ClutterActor *box1, *box2;
 
   layout1 = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
@@ -681,8 +645,9 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
   *box = box1;
 
   rectangle = empathy_rounded_rectangle_new (
-      SELF_VIDEO_SECTION_WIDTH + 5,
-      SELF_VIDEO_SECTION_HEIGHT + 5);
+      SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
+      SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN,
+      PREVIEW_ROUND_FACTOR);
 
   clutter_actor_set_size (box1,
       SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
@@ -702,14 +667,14 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
       SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (box1), box2);
-  clutter_container_add_actor (CLUTTER_CONTAINER (box2), rectangle);
+  clutter_container_add_actor (CLUTTER_CONTAINER (box2), CLUTTER_ACTOR (rectangle));
 
   clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (self->priv->video_layout),
       box1, x, y);
 
-  clutter_actor_hide (rectangle);
+  clutter_actor_hide (CLUTTER_ACTOR (rectangle));
 
-  return rectangle;
+  return CLUTTER_ACTOR (rectangle);
 }
 
 static void
@@ -828,7 +793,7 @@ empathy_call_window_get_preview_position (EmpathyCallWindow *self,
     }
   else if (box.width - SELF_VIDEO_SECTION_MARGIN >= event_x &&
       event_x >= (box.width - SELF_VIDEO_SECTION_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) &&
-      box.height - SELF_VIDEO_SECTION_MARGIN - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y &&
+      box.height - 2 * SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y &&
       event_y >= (box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGHT))
     {
       pos = PREVIEW_POS_BOTTOM_RIGHT;
@@ -916,7 +881,7 @@ empathy_call_window_highlight_preview_rectangle (EmpathyCallWindow *self,
   rectangle = empathy_call_window_get_preview_rectangle (self, pos);
 
   empathy_rounded_rectangle_set_border_width (
-      EMPATHY_ROUNDED_RECTANGLE (rectangle), 5);
+      EMPATHY_ROUNDED_RECTANGLE (rectangle), 2 * SELF_VIDEO_SECTION_MARGIN);
   empathy_rounded_rectangle_set_border_color (
       EMPATHY_ROUNDED_RECTANGLE (rectangle), CLUTTER_COLOR_Red);
 }
@@ -1105,6 +1070,7 @@ create_video_preview (EmpathyCallWindow *self)
   GtkWidget *button;
   PreviewPosition pos;
   GdkRGBA transparent = { 0., 0., 0., 0. };
+  GtkWidget *bin;
 
   g_assert (priv->video_preview == NULL);
 
@@ -1113,8 +1079,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,
@@ -1127,9 +1097,7 @@ create_video_preview (EmpathyCallWindow *self)
 
   /* Spinner for when changing the camera device */
   priv->preview_spinner_widget = gtk_spinner_new ();
-  priv->preview_spinner_actor = empathy_rounded_actor_new ();
-  empathy_rounded_actor_set_round_factor (
-      EMPATHY_ROUNDED_ACTOR (priv->preview_spinner_actor), 16);
+  priv->preview_spinner_actor = empathy_rounded_actor_new (PREVIEW_ROUND_FACTOR);
 
   g_object_set (priv->preview_spinner_widget, "expand", TRUE, NULL);
   gtk_widget_override_background_color (
@@ -1170,18 +1138,17 @@ create_video_preview (EmpathyCallWindow *self)
   /* Translators: this is an "Info" label. It should be as short
    * as possible. */
   button = gtk_button_new_with_label (_("i"));
-  priv->preview_shown_button = b = empathy_rounded_actor_new ();
-  gtk_container_add (
-      GTK_CONTAINER (gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (b))),
-      button);
+  priv->preview_shown_button = b = gtk_clutter_actor_new_with_contents (button);
   clutter_actor_set_size (b, 24, 24);
+  bin = gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (b));
+  gtk_widget_override_background_color (bin, GTK_STATE_FLAG_NORMAL, &transparent);
 
   layout_end = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_END,
       CLUTTER_BIN_ALIGNMENT_END);
   box = clutter_box_new (layout_end);
   clutter_actor_set_size (box,
-      SELF_VIDEO_SECTION_WIDTH,
-      SELF_VIDEO_SECTION_HEIGHT + SELF_VIDEO_SECTION_MARGIN);
+      SELF_VIDEO_SECTION_WIDTH - 4,
+      SELF_VIDEO_SECTION_HEIGHT - 2);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (box), b);
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_preview), box);
@@ -1193,12 +1160,9 @@ create_video_preview (EmpathyCallWindow *self)
   /* Translators: this is an "Info" label. It should be as short
    * as possible. */
   button = gtk_button_new_with_label (_("i"));
-  b = empathy_rounded_actor_new ();
-  gtk_container_add (
-      GTK_CONTAINER (gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (b))),
-      button);
+  priv->preview_hidden_button = b = gtk_clutter_actor_new_with_contents (button);
   clutter_actor_set_size (b, 24, 24);
-  priv->preview_hidden_button = b;
+  gtk_widget_override_background_color (bin, GTK_STATE_FLAG_NORMAL, &transparent);
 
   clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->video_layout),
       priv->preview_hidden_button,
@@ -1550,7 +1514,7 @@ empathy_call_window_set_state_ringing (EmpathyCallWindow *self)
 
   g_assert (self->priv->call_state != CONNECTED);
 
-  video = tpy_call_channel_has_initial_video (self->priv->pending_channel);
+  video = tp_call_channel_has_initial_video (self->priv->pending_channel, NULL);
 
   empathy_call_window_status_message (self, _("Incoming call"));
   self->priv->call_state = RINGING;
@@ -1594,7 +1558,7 @@ empathy_call_window_cdo_invalidated_cb (TpProxy *channel,
 
 void
 empathy_call_window_start_ringing (EmpathyCallWindow *self,
-    TpyCallChannel *channel,
+    TpCallChannel *channel,
     TpChannelDispatchOperation *dispatch_operation,
     TpAddDispatchOperationContext *context)
 {
@@ -1762,7 +1726,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   create_audio_input (self);
   create_video_input (self);
 
-  priv->floating_toolbar = empathy_rounded_actor_new ();
+  priv->floating_toolbar = empathy_rounded_actor_new (2);
 
   gtk_widget_reparent (priv->bottom_toolbar,
       gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (priv->floating_toolbar)));
@@ -1818,8 +1782,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
   g_signal_connect (priv->dtmf_panel, "start-tone",
       G_CALLBACK (dtmf_start_tone_cb), self);
 
-  priv->tones = g_string_new ("");
-
   gtk_box_pack_start (GTK_BOX (priv->pane), priv->dtmf_panel,
       FALSE, FALSE, 6);
 
@@ -2247,18 +2209,19 @@ empathy_call_window_constructed (GObject *object)
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  TpyCallChannel *call;
-  TpyCallState state;
+  TpCallChannel *call;
+  TpCallState state;
 
   g_assert (priv->handler != NULL);
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
-  state = tpy_call_channel_get_state (call, NULL, NULL);
-  priv->outgoing = (state == TPY_CALL_STATE_PENDING_INITIATOR);
+  state = tp_call_channel_get_state (call, NULL, NULL, NULL);
+  priv->outgoing = (state == TP_CALL_STATE_PENDING_INITIATOR);
   tp_clear_object (&call);
 
-  g_object_get (priv->handler, "target-contact", &priv->contact, NULL);
+  priv->contact = empathy_call_handler_get_contact (priv->handler);
   g_assert (priv->contact != NULL);
+  g_object_ref (priv->contact);
 
   if (!empathy_contact_can_voip_video (priv->contact))
     {
@@ -2401,6 +2364,7 @@ empathy_call_window_dispose (GObject *object)
   tp_clear_object (&priv->sound_mgr);
   tp_clear_object (&priv->mic_menu);
   tp_clear_object (&priv->camera_menu);
+  tp_clear_object (&priv->transitions);
 
   g_list_free_full (priv->notifiers, g_object_unref);
 
@@ -2408,12 +2372,7 @@ empathy_call_window_dispose (GObject *object)
     g_source_remove (priv->timer_id);
   priv->timer_id = 0;
 
-  if (priv->contact != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (priv->contact,
-          contact_name_changed_cb, self);
-      priv->contact = NULL;
-    }
+  tp_clear_object (&priv->contact);
 
   G_OBJECT_CLASS (empathy_call_window_parent_class)->dispose (object);
 }
@@ -2444,8 +2403,6 @@ empathy_call_window_finalize (GObject *object)
 
   g_timer_destroy (priv->timer);
 
-  g_string_free (priv->tones, TRUE);
-
   G_OBJECT_CLASS (empathy_call_window_parent_class)->finalize (object);
 }
 
@@ -2597,9 +2554,6 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
   gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
   gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
 
-  priv->sending_tones = FALSE;
-  g_string_set_size (priv->tones, 0);
-
   could_reset_pipeline = empathy_call_window_reset_pipeline (self);
 
   if (priv->call_state == CONNECTING)
@@ -3055,7 +3009,7 @@ display_error (EmpathyCallWindow *self,
 #if 0
 static gchar *
 media_stream_error_to_txt (EmpathyCallWindow *self,
-    TpyCallChannel *call,
+    TpCallChannel *call,
     gboolean audio,
     TpMediaStreamError error)
 {
@@ -3127,7 +3081,7 @@ media_stream_error_to_txt (EmpathyCallWindow *self,
 
 static void
 empathy_call_window_stream_error (EmpathyCallWindow *self,
-    TpyCallChannel *call,
+    TpCallChannel *call,
     gboolean audio,
     guint code,
     const gchar *msg,
@@ -3151,7 +3105,7 @@ empathy_call_window_stream_error (EmpathyCallWindow *self,
 }
 
 static void
-empathy_call_window_audio_stream_error (TpyCallChannel *call,
+empathy_call_window_audio_stream_error (TpCallChannel *call,
     guint code,
     const gchar *msg,
     EmpathyCallWindow *self)
@@ -3161,7 +3115,7 @@ empathy_call_window_audio_stream_error (TpyCallChannel *call,
 }
 
 static void
-empathy_call_window_video_stream_error (TpyCallChannel *call,
+empathy_call_window_video_stream_error (TpCallChannel *call,
     guint code,
     const gchar *msg,
     EmpathyCallWindow *self)
@@ -3220,22 +3174,22 @@ show_balance_error (EmpathyCallWindow *self)
 
 static void
 empathy_call_window_state_changed_cb (EmpathyCallHandler *handler,
-    TpyCallState state,
+    TpCallState state,
     gchar *reason,
     EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  TpyCallChannel *call;
+  TpCallChannel *call;
   gboolean can_send_video;
 
-  if (state == TPY_CALL_STATE_ENDED &&
+  if (state == TP_CALL_STATE_ENDED &&
       !tp_strdiff (reason, TP_ERROR_STR_INSUFFICIENT_BALANCE))
     {
       show_balance_error (self);
       return;
     }
 
-  if (state != TPY_CALL_STATE_ACCEPTED)
+  if (state != TP_CALL_STATE_ACCEPTED)
     return;
 
   if (priv->call_state == CONNECTED)
@@ -3252,7 +3206,7 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler,
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
 
-  if (tpy_call_channel_has_dtmf (call))
+  if (tp_call_channel_has_dtmf (call))
     gtk_widget_set_sensitive (priv->dtmf_panel, TRUE);
 
   if (priv->video_input == NULL)
@@ -3519,9 +3473,11 @@ empathy_call_window_content_added_cb (EmpathyCallHandler *handler,
         if (GST_PAD_LINK_FAILED (gst_pad_link (pad, sink)))
           {
             gst_bin_remove (GST_BIN (priv->pipeline), priv->audio_input);
+            gst_object_unref (pad);
             g_warning ("Could not link audio source to farsight");
             break;
           }
+        gst_object_unref (pad);
 
         if (gst_element_set_state (priv->audio_input, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE)
           {
@@ -3597,20 +3553,20 @@ start_call (EmpathyCallWindow *self)
 
   if (empathy_call_handler_has_initial_video (priv->handler))
     {
-      TpyCallChannel *call;
-      TpySendingState s;
+      TpCallChannel *call;
+      TpSendingState s;
 
       g_object_get (priv->handler, "call-channel", &call, NULL);
       /* If the call channel isn't set yet we're requesting it, if we're
        * requesting it with initial video it should be PENDING_SEND when we get
        * it */
       if (call == NULL)
-        s = TPY_SENDING_STATE_PENDING_SEND;
+        s = TP_SENDING_STATE_PENDING_SEND;
       else
-        s = tpy_call_channel_get_video_state (call);
+        s = empathy_call_channel_get_video_state (call);
 
-      if (s == TPY_SENDING_STATE_PENDING_SEND ||
-          s == TPY_SENDING_STATE_SENDING)
+      if (s == TP_SENDING_STATE_PENDING_SEND ||
+          s == TP_SENDING_STATE_SENDING)
         {
           /* Enable 'send video' buttons and display the preview */
           gtk_toggle_tool_button_set_active (
@@ -3726,8 +3682,10 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
 }
 
 static void
-empathy_call_window_members_changed_cb (TpyCallChannel *call,
-    GHashTable *members,
+empathy_call_window_members_changed_cb (TpCallChannel *call,
+    GHashTable *updates,
+    GPtrArray *removed,
+    TpCallStateReason *reason,
     EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
@@ -3735,10 +3693,10 @@ empathy_call_window_members_changed_cb (TpyCallChannel *call,
   gpointer key, value;
   gboolean held = FALSE;
 
-  g_hash_table_iter_init (&iter, members);
+  g_hash_table_iter_init (&iter, updates);
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      if (GPOINTER_TO_INT (value) & TPY_CALL_MEMBER_FLAG_HELD)
+      if (GPOINTER_TO_INT (value) & TP_CALL_MEMBER_FLAG_HELD)
         {
           /* This assumes this is a 1-1 call, otherwise one participant
            * putting the call on hold wouldn't mean the call is on hold
@@ -3760,7 +3718,7 @@ call_handler_notify_call_cb (EmpathyCallHandler *handler,
     EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  TpyCallChannel *call;
+  TpCallChannel *call;
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
   if (call == NULL)
@@ -3776,10 +3734,6 @@ call_handler_notify_call_cb (EmpathyCallHandler *handler,
   tp_g_signal_connect_object (call, "members-changed",
       G_CALLBACK (empathy_call_window_members_changed_cb), self, 0);
 
-  tp_cli_channel_interface_dtmf_connect_to_stopped_tones (TP_CHANNEL (call),
-      empathy_call_window_tones_stopped_cb, self, NULL,
-      G_OBJECT (call), NULL);
-
   g_object_unref (call);
 }
 
@@ -3787,7 +3741,7 @@ static void
 empathy_call_window_connect_handler (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  TpyCallChannel *call;
+  TpCallChannel *call;
 
   g_signal_connect (priv->handler, "state-changed",
     G_CALLBACK (empathy_call_window_state_changed_cb), self);
@@ -4000,7 +3954,7 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
   CameraState state)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
-  TpyCallChannel *call;
+  TpCallChannel *call;
 
   priv->sending_video = (state == CAMERA_STATE_ON);
 
@@ -4020,7 +3974,7 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window,
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
   DEBUG ("%s sending video", priv->sending_video ? "start": "stop");
-  tpy_call_channel_send_video (call, priv->sending_video);
+  empathy_call_channel_send_video (call, priv->sending_video);
   g_object_unref (call);
 }
 
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index abaae2763..a5df2dac4 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -66,7 +66,7 @@ EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
 void empathy_call_window_present (EmpathyCallWindow *window,
   EmpathyCallHandler *handler);
 void empathy_call_window_start_ringing (EmpathyCallWindow *self,
-  TpyCallChannel *channel,
+  TpCallChannel *channel,
   TpChannelDispatchOperation *dispatch_operation,
   TpAddDispatchOperationContext *context);
 
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 2ff49a81b..207f32f25 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -30,9 +30,11 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
-#include <telepathy-glib/debug-sender.h>
+#ifdef CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
 
-#include <telepathy-yell/telepathy-yell.h>
+#include <telepathy-glib/debug-sender.h>
 
 #include <libempathy/empathy-client-factory.h>
 
@@ -87,7 +89,7 @@ find_window_for_handle (gpointer key,
 static gboolean
 incoming_call_cb (EmpathyCallFactory *factory,
     guint handle,
-    TpyCallChannel *channel,
+    TpCallChannel *channel,
     TpChannelDispatchOperation *dispatch_operation,
     TpAddDispatchOperationContext *context,
     gpointer user_data)
@@ -117,7 +119,7 @@ new_call_handler_cb (EmpathyCallFactory *factory,
 
   DEBUG ("Show the call window");
 
-  g_object_get (handler, "target-contact", &contact, NULL);
+  contact = empathy_call_handler_get_contact (handler);
 
   window = g_hash_table_lookup (call_windows, contact);
 
@@ -187,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 ();
 
@@ -209,9 +217,6 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  tpy_cli_init ();
-
-  gtk_clutter_init (&argc, &argv);
   clutter_gst_init (&argc, &argv);
 
   empathy_gtk_init ();
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index a52585736..dd828fa68 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 1bb9de4aa..587ae7d4b 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 = NULL;
+	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..ef2011895 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -43,6 +43,7 @@
             <property name="active">TRUE</property>
             <property name="label" translatable="yes">_Show Contact List</property>
           </object>
+          <accelerator key="F9" modifiers=""/>
         </child>
         <child>
           <object class="GtkAction" id="menu_conv_invite_participant">
@@ -205,8 +206,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..79e4d2ad1 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -21,10 +21,13 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
@@ -69,6 +72,9 @@ enum
   COL_NAME = 0,
   COL_UNIQUE_NAME,
   COL_GONE,
+  COL_ACTIVE_BUFFER,
+  COL_PAUSE_BUFFER,
+  COL_PROXY,
   NUM_COLS
 };
 
@@ -85,17 +91,14 @@ typedef struct
   /* Toolbar items */
   GtkWidget *chooser;
   GtkToolItem *save_button;
+  GtkToolItem *send_to_pastebin;
   GtkToolItem *copy_button;
   GtkToolItem *clear_button;
   GtkToolItem *pause_button;
   GtkToolItem *level_label;
   GtkWidget *level_filter;
 
-  /* Cache */
-  GHashTable *cache;
-
   /* TreeView */
-  GtkListStore *store;
   GtkTreeModel *store_filter;
   GtkWidget *view;
   GtkWidget *scrolled_win;
@@ -104,10 +107,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 +115,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 +157,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 +173,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);
 
-  dm = debug_message_new (timestamp, domain, level, message);
-  messages = g_list_append (messages, dm);
+  g_free (domain);
+  g_free (category);
+  g_free (level_string);
+  g_free (message);
+
+  return FALSE;
+}
+
+static void
+insert_values_in_buffer (GtkListStore *store,
+        gdouble timestamp,
+        const gchar *domain,
+        const gchar *category,
+        guint level,
+        const gchar *string)
+{
+  GtkTreeIter iter;
 
-  g_hash_table_insert (priv->cache, name, messages);
+  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 +240,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 +261,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 +298,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);
@@ -320,6 +326,7 @@ debug_window_set_toolbar_sensitivity (EmpathyDebugWindow *debug_window,
   GtkWidget *vbox = gtk_bin_get_child (GTK_BIN (debug_window));
 
   gtk_widget_set_sensitive (GTK_WIDGET (priv->save_button), sensitive);
+  gtk_widget_set_sensitive (GTK_WIDGET (priv->send_to_pastebin), sensitive);
   gtk_widget_set_sensitive (GTK_WIDGET (priv->copy_button), sensitive);
   gtk_widget_set_sensitive (GTK_WIDGET (priv->clear_button), sensitive);
   gtk_widget_set_sensitive (GTK_WIDGET (priv->pause_button), sensitive);
@@ -344,6 +351,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 +428,300 @@ 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 */
 
-      debug_window_add_message (debug_window, FALSE, dm->timestamp,
-          dm->domain, dm->level, dm->message);
+  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
-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);
+
+  tp_clear_object (&priv->store_filter);
+  priv->store_filter = gtk_tree_model_filter_new (
+      GTK_TREE_MODEL (active_buffer), NULL);
 
-  /* Proxy has been invalidated so we can't disconnect the signal any more */
-  priv->new_debug_message_signal = 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 +731,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 +747,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);
 
-  if (gone)
+  DEBUG ("Service chosen: %s", name);
+
+  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 +941,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 +953,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 +965,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 +990,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 +1020,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 +1048,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 +1085,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 +1094,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 +1176,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 +1196,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 +1231,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 +1242,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 +1279,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 +1331,25 @@ 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);
+  /* "All" is the first choice in the service chooser and it's buffer is
+   * not saved in the service-store but is accessed using a private
+   * reference */
+  if (gtk_combo_box_get_active (GTK_COMBO_BOX (priv->chooser)) == 0)
+    {
+      gtk_list_store_clear (priv->all_active_buffer);
+      return;
+    }
+
+  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
@@ -1125,12 +1495,10 @@ debug_window_store_filter_foreach (GtkTreeModel *model,
     GtkTreeIter *iter,
     gpointer user_data)
 {
-  GFileOutputStream *output_stream = (GFileOutputStream *) user_data;
+  gchar **debug_data = (gchar **)user_data;
   gchar *domain, *category, *message, *level_str, *level_upper;
   gdouble timestamp;
-  gchar *line, *time_str;
-  GError *error = NULL;
-  gboolean out = FALSE;
+  gchar *line, *time_str, *tmp;
 
   gtk_tree_model_get (model, iter,
       COL_DEBUG_TIMESTAMP, &timestamp,
@@ -1150,15 +1518,14 @@ debug_window_store_filter_foreach (GtkTreeModel *model,
 
   g_free (time_str);
 
-  g_output_stream_write (G_OUTPUT_STREAM (output_stream), line,
-      strlen (line), NULL, &error);
+  /* Compact all message lines in the out parameter debug_data */
+  if (!tp_str_empty (*debug_data))
+    tmp = g_strconcat (*debug_data, line, NULL);
+  else
+    tmp = g_strdup (line);
 
-  if (error != NULL)
-    {
-      DEBUG ("Failed to write to file: %s", error->message);
-      g_error_free (error);
-      out = TRUE;
-    }
+  g_free (*debug_data);
+  *debug_data = tmp;
 
   g_free (line);
   g_free (level_upper);
@@ -1167,7 +1534,7 @@ debug_window_store_filter_foreach (GtkTreeModel *model,
   g_free (category);
   g_free (message);
 
-  return out;
+  return FALSE;
 }
 
 static void
@@ -1178,8 +1545,10 @@ debug_window_save_file_chooser_response_cb (GtkDialog *dialog,
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   gchar *filename = NULL;
   GFile *gfile = NULL;
+  gchar *debug_data = NULL;
   GFileOutputStream *output_stream = NULL;
-  GError *error = NULL;
+  GError *file_open_error = NULL;
+  GError *file_write_error = NULL;
 
   if (response_id != GTK_RESPONSE_ACCEPT)
     goto OUT;
@@ -1190,17 +1559,27 @@ debug_window_save_file_chooser_response_cb (GtkDialog *dialog,
 
   gfile = g_file_new_for_path (filename);
   output_stream = g_file_replace (gfile, NULL, FALSE,
-      G_FILE_CREATE_NONE, NULL, &error);
+      G_FILE_CREATE_NONE, NULL, &file_open_error);
 
-  if (error != NULL)
+  if (file_open_error != NULL)
     {
-      DEBUG ("Failed to open file for writing: %s", error->message);
-      g_error_free (error);
+      DEBUG ("Failed to open file for writing: %s", file_open_error->message);
+      g_error_free (file_open_error);
       goto OUT;
     }
 
   gtk_tree_model_foreach (priv->store_filter,
-      debug_window_store_filter_foreach, output_stream);
+      debug_window_store_filter_foreach, &debug_data);
+
+  g_output_stream_write (G_OUTPUT_STREAM (output_stream), debug_data,
+      strlen (debug_data), NULL, &file_write_error);
+  g_free (debug_data);
+
+  if (file_write_error != NULL)
+    {
+      DEBUG ("Failed to write to file: %s", file_write_error->message);
+      g_error_free (file_write_error);
+    }
 
 OUT:
   if (gfile != NULL)
@@ -1244,7 +1623,7 @@ debug_window_save_clicked_cb (GtkToolButton *tool_button,
   tm_s = localtime (&t);
   if (tm_s != NULL)
     {
-      if (strftime(time_str, sizeof (time_str), "%d-%m-%y_%H-%M-%S", tm_s))
+      if (strftime (time_str, sizeof (time_str), "%d-%m-%y_%H-%M-%S", tm_s))
         tmp = g_strdup_printf ("%s-%s.log", name, time_str);
     }
 
@@ -1262,6 +1641,135 @@ debug_window_save_clicked_cb (GtkToolButton *tool_button,
   gtk_widget_show (file_chooser);
 }
 
+static void
+debug_window_pastebin_response_dialog_closed_cb (GtkDialog *dialog,
+    gint response_id,
+    SoupBuffer *buffer)
+{
+  soup_buffer_free (buffer);
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+debug_window_pastebin_callback (SoupSession *session,
+    SoupMessage *msg,
+    gpointer debug_window)
+{
+  GtkWidget *dialog;
+  SoupBuffer *buffer;
+
+  buffer = soup_message_body_flatten (msg->response_body);
+  if (g_str_has_prefix (buffer->data, "http://pastebin.com/"))
+    {
+      dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window),
+          GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+          _("Pastebin link"));
+
+      gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+          "<a href=\"%s\">%s</a>", buffer->data, buffer->data);
+    }
+  else
+    {
+      dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window),
+          GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+          _("Pastebin response"));
+
+      if (!tp_str_empty (buffer->data))
+        gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+            _("%s"), buffer->data);
+      else
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+            _("Data too large for a single paste. Please save logs to file."));
+    }
+
+  g_object_unref (session);
+
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), debug_window);
+
+  gtk_widget_show_all (GTK_WIDGET (dialog));
+
+  g_signal_connect_after (dialog, "response", G_CALLBACK (
+      debug_window_pastebin_response_dialog_closed_cb), buffer);
+}
+
+static void
+debug_window_message_dialog (EmpathyDebugWindow *debug_window,
+    const gchar *primary_text,
+    const gchar *secondary_text)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (GTK_WINDOW (debug_window),
+      GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+      "%s", _(primary_text));
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+      "%s", _(secondary_text));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog),
+      GTK_WINDOW (debug_window));
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
+}
+
+static void
+debug_window_send_to_pastebin (EmpathyDebugWindow *debug_window,
+    gchar *debug_data)
+{
+  SoupSession *session;
+  SoupMessage *msg;
+  gchar       *api_dev_key, *api_paste_code, *api_paste_name, *formdata;
+
+  if (tp_str_empty (debug_data))
+    {
+      debug_window_message_dialog (debug_window, "Error", "No data to send");
+      return;
+    }
+
+  /* Constructing a valid URL for http post. See http://pastebin.com/api#2 */
+
+  /* The api_dev_key is the author's developer key to access the Pastebin API
+   * This developer key is published here with the autorization of pastebin;
+   * see PASTEBIN-API-KEY.txt */
+  api_dev_key = soup_uri_encode ("f6ccfabfdcd4b77b825ee38a30d11d52", NULL);
+  api_paste_code = soup_uri_encode (debug_data, NULL);
+  api_paste_name = soup_uri_encode ("Empathy debug data", NULL);
+  formdata = g_strdup_printf ("api_dev_key=%s&api_paste_code=%s"
+      "&api_paste_name=%s&api_paste_format=text&api_option=paste",
+      api_dev_key, api_paste_code, api_paste_name);
+
+  session = soup_session_async_new ();
+
+  msg = soup_message_new ("POST", "http://pastebin.com/api/api_post.php");
+  soup_message_set_request (msg,
+      "application/x-www-form-urlencoded;charset=UTF-8", SOUP_MEMORY_COPY,
+      formdata, strlen (formdata));
+
+  g_free (api_dev_key);
+  g_free (api_paste_code);
+  g_free (api_paste_name);
+  g_free (formdata);
+
+  soup_session_queue_message (session, msg, debug_window_pastebin_callback,
+      debug_window);
+}
+
+static void
+debug_window_send_to_pastebin_cb (GtkToolButton *tool_button,
+    EmpathyDebugWindow *debug_window)
+{
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  gchar *debug_data = NULL;
+
+  DEBUG ("Preparing debug data for sending to pastebin.");
+
+  gtk_tree_model_foreach (priv->store_filter,
+      debug_window_store_filter_foreach, &debug_data);
+
+  debug_window_send_to_pastebin (debug_window, debug_data);
+  g_free (debug_data);
+}
+
 static gboolean
 debug_window_copy_model_foreach (GtkTreeModel *model,
     GtkTreePath *path,
@@ -1347,37 +1855,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 +1933,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);
@@ -1482,6 +1964,16 @@ am_prepared_cb (GObject *am,
   gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->save_button), TRUE);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->save_button, -1);
 
+  /* Send to pastebin */
+  priv->send_to_pastebin = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE);
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->send_to_pastebin),
+      _("Send to pastebin"));
+  g_signal_connect (priv->send_to_pastebin, "clicked",
+      G_CALLBACK (debug_window_send_to_pastebin_cb), object);
+  gtk_widget_show (GTK_WIDGET (priv->send_to_pastebin));
+  gtk_tool_item_set_is_important (GTK_TOOL_ITEM (priv->send_to_pastebin), TRUE);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->send_to_pastebin, -1);
+
   /* Copy */
   priv->copy_button = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
   g_signal_connect (priv->copy_button, "clicked",
@@ -1544,38 +2036,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 +2095,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 +2119,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 +2145,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 +2179,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 +2196,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 +2211,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-event-manager.c b/src/empathy-event-manager.c
index 321cd1cca..c6b3e29ed 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -29,8 +29,6 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/simple-approver.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-connection-aggregator.h>
@@ -45,6 +43,7 @@
 #include <libempathy-gtk/empathy-contact-dialogs.h>
 #include <libempathy-gtk/empathy-sound-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-event-manager.h"
 #include "empathy-roster-window.h"
@@ -413,10 +412,10 @@ reject_channel_claim_cb (GObject *source,
     {
       empathy_tp_streamed_media_close (user_data);
     }
-  else if (TPY_IS_CALL_CHANNEL (user_data))
+  else if (TP_IS_CALL_CHANNEL (user_data))
     {
-      tpy_call_channel_hangup_async (user_data,
-          TPY_CALL_STATE_CHANGE_REASON_USER_REQUESTED,
+      tp_call_channel_hangup_async (user_data,
+          TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED,
           "", "", NULL, NULL);
       tp_channel_close_async (user_data, NULL, NULL);
     }
@@ -474,7 +473,7 @@ event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog,
     }
   else if (response == ACCEPT_WITHOUT_VIDEO)
     {
-      tpy_call_channel_send_video (TPY_CALL_CHANNEL (approval->main_channel),
+      empathy_call_channel_send_video (TP_CALL_CHANNEL (approval->main_channel),
         FALSE);
       event_manager_approval_approve (approval);
     }
@@ -508,9 +507,9 @@ event_channel_process_voip_func (EventPriv *event)
     }
   else if (etype == EMPATHY_EVENT_TYPE_CALL)
     {
-      TpyCallChannel *call;
-      call = TPY_CALL_CHANNEL (event->approval->handler_instance);
-      g_object_get (G_OBJECT (call), "initial-video", &video, NULL);
+      TpCallChannel *call;
+      call = TP_CALL_CHANNEL (event->approval->handler_instance);
+      video = tp_call_channel_has_initial_video (call, NULL);
     }
   else
     {
@@ -638,7 +637,7 @@ event_manager_approval_done (EventManagerApproval *approval)
       channel_type = tp_channel_get_channel_type_id (approval->main_channel);
 
       if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
-          channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+          channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
         {
           priv->ringing--;
           if (priv->ringing == 0)
@@ -676,14 +675,14 @@ cdo_invalidated_cb (TpProxy *cdo,
 }
 
 static void
-event_manager_call_state_changed_cb (TpyCallChannel *call,
-  TpyCallState state,
-  TpyCallFlags flags,
-   const GValueArray *call_state_reason,
-  GHashTable *call_state_details,
+event_manager_call_state_changed_cb (TpCallChannel *call,
+  TpCallState state,
+  TpCallFlags flags,
+  TpCallStateReason *reason,
+  GHashTable *details,
   EventManagerApproval *approval)
 {
-  if (state == TPY_CALL_STATE_ENDED)
+  if (state == TP_CALL_STATE_ENDED)
     {
       DEBUG ("Call ended, seems we missed it :/");
       reject_approval (approval);
@@ -700,11 +699,11 @@ event_manager_call_channel_got_contact_cb (TpConnection *connection,
   EventManagerApproval *approval = (EventManagerApproval *) user_data;
   EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
   GtkWidget *window;
-  TpyCallChannel *call;
+  TpCallChannel *call;
   gchar *header;
   gboolean video;
 
-  call = TPY_CALL_CHANNEL (approval->handler_instance);
+  call = TP_CALL_CHANNEL (approval->handler_instance);
 
   if (error != NULL)
     {
@@ -713,7 +712,7 @@ event_manager_call_channel_got_contact_cb (TpConnection *connection,
       return;
     }
 
-  if (tpy_call_channel_get_state (call, NULL, NULL) == TPY_CALL_STATE_ENDED)
+  if (tp_call_channel_get_state (call, NULL, NULL, NULL) == TP_CALL_STATE_ENDED)
     {
       DEBUG ("Call already ended, seems we missed it :/");
       reject_approval (approval);
@@ -982,7 +981,7 @@ find_main_channel (GList *channels)
       channel_type = tp_channel_get_channel_type_id (channel);
 
       if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
-          channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL ||
+          channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL ||
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER ||
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
         return channel;
@@ -1104,9 +1103,9 @@ approve_channels (TpSimpleApprover *approver,
         }
 
     }
-  else if (channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+  else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
     {
-      TpyCallChannel *call = TPY_CALL_CHANNEL (channel);
+      TpCallChannel *call = TP_CALL_CHANNEL (channel);
       const gchar *id;
 
       approval->handler_instance = g_object_ref (call);
@@ -1510,7 +1509,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
   tp_base_client_take_approver_filter (priv->approver,
       tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
+          TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
 
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-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index ece86f1b6..fd5bd8f76 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -9,6 +9,8 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <glib/gi18n.h>
 #include <folks/folks-telepathy.h>
 
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index ac51459fb..7a4f03731 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -25,11 +25,10 @@
 #include <libnotify/notify.h>
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-tp-streamed-media.h>
 
 #include <libempathy-gtk/empathy-notify-manager.h>
+#include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-event-manager.h"
 
@@ -127,8 +126,8 @@ notification_approve_no_video_cb (NotifyNotification *notification,
 {
   if (self->priv->event)
     {
-      tpy_call_channel_send_video (
-          TPY_CALL_CHANNEL (self->priv->event->handler_instance),
+      empathy_call_channel_send_video (
+          TP_CALL_CHANNEL (self->priv->event->handler_instance),
           FALSE);
       empathy_event_approve (self->priv->event);
     }
@@ -197,8 +196,8 @@ add_notification_actions (EmpathyNotificationsApprover *self,
         video = empathy_tp_streamed_media_has_initial_video (
             EMPATHY_TP_STREAMED_MEDIA (self->priv->event->handler_instance));
       else
-        video = tpy_call_channel_has_initial_video (
-            TPY_CALL_CHANNEL (self->priv->event->handler_instance));
+        video = tp_call_channel_has_initial_video (
+            TP_CALL_CHANNEL (self->priv->event->handler_instance), NULL);
 
       notify_notification_add_action (notification,
         "reject", _("Reject"), (NotifyActionCallback) notification_decline_cb,
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.c b/src/empathy-roster-window.c
index 575f719c1..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);
 }
@@ -2088,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,
@@ -2098,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
@@ -2123,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"
   };
@@ -2138,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)
@@ -2164,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);
 
@@ -2171,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);
 }
 
@@ -2264,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;
@@ -2306,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);
 
@@ -2434,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).
@@ -2461,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);
 
@@ -2504,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 ();
@@ -2557,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..646682fb5 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>
@@ -74,15 +75,12 @@ empathy_rounded_actor_class_init (EmpathyRoundedActorClass *klass)
 }
 
 ClutterActor *
-empathy_rounded_actor_new (void)
+empathy_rounded_actor_new (guint round_factor)
 {
-  return CLUTTER_ACTOR (
+  EmpathyRoundedActor *self = EMPATHY_ROUNDED_ACTOR (
     g_object_new (EMPATHY_TYPE_ROUNDED_ACTOR, NULL));
-}
 
-void
-empathy_rounded_actor_set_round_factor (EmpathyRoundedActor *self,
-    guint round_factor)
-{
   self->priv->round_factor = round_factor;
+
+  return CLUTTER_ACTOR (self);
 }
diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
index 4287cf389..49fc03fd3 100644
--- a/src/empathy-rounded-actor.h
+++ b/src/empathy-rounded-actor.h
@@ -59,10 +59,7 @@ GType empathy_rounded_actor_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ROUNDED_ACTOR, \
     EmpathyRoundedActorClass))
 
-ClutterActor *empathy_rounded_actor_new (void);
-
-void empathy_rounded_actor_set_round_factor (EmpathyRoundedActor *self,
-    guint round_factor);
+ClutterActor *empathy_rounded_actor_new (guint round_factor);
 
 G_END_DECLS
 
diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index e06889d58..7b8951f80 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>
@@ -30,21 +32,26 @@ G_DEFINE_TYPE (EmpathyRoundedRectangle,
 
 struct _EmpathyRoundedRectanglePriv
 {
+  guint width, height;
   ClutterColor border_color;
   guint border_width;
+  guint round_factor;
 };
 
-static void
-empathy_rounded_rectangle_paint (EmpathyRoundedRectangle *self)
+static gboolean
+draw_cb (ClutterCairoTexture *canvas,
+    cairo_t *cr)
 {
+  EmpathyRoundedRectangle *self = EMPATHY_ROUNDED_RECTANGLE (canvas);
   guint width, height;
+  guint border_width;
   guint tmp_alpha;
-  cairo_t *cr;
-
-#define RADIUS (height / 8.)
+  gdouble radius;
 
-  clutter_cairo_texture_get_surface_size (CLUTTER_CAIRO_TEXTURE (self),
-      &width, &height);
+  width = self->priv->width;
+  height = self->priv->height;
+  radius = self->priv->height / self->priv->round_factor;
+  border_width = self->priv->border_width;
 
   /* compute the composited opacity of the actor taking into
    * account the opacity of the color set by the user */
@@ -52,35 +59,35 @@ empathy_rounded_rectangle_paint (EmpathyRoundedRectangle *self)
             * self->priv->border_color.alpha
             / 255;
 
-  cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (self));
-
   cairo_set_source_rgba (cr,
       self->priv->border_color.red,
       self->priv->border_color.green,
       self->priv->border_color.blue,
       tmp_alpha);
 
-  cairo_set_line_width (cr, self->priv->border_width);
+  cairo_set_line_width (cr, border_width);
 
   cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint (cr);
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
+  /* make room for the portion of the border drawn on the outside */
+  cairo_translate (cr, border_width/2.0, border_width/2.0);
+
   cairo_new_sub_path (cr);
-  cairo_arc (cr, width - RADIUS, RADIUS, RADIUS,
+  cairo_arc (cr, width - radius, radius, radius,
       -M_PI/2.0, 0);
-  cairo_arc (cr, width - RADIUS, height - RADIUS, RADIUS,
+  cairo_arc (cr, width - radius, height - radius, radius,
       0, M_PI/2.0);
-  cairo_arc (cr, RADIUS, height - RADIUS, RADIUS,
+  cairo_arc (cr, radius, height - radius, radius,
       M_PI/2.0, M_PI);
-  cairo_arc (cr, RADIUS, RADIUS, RADIUS,
+  cairo_arc (cr, radius, radius, radius,
       M_PI, -M_PI/2.0);
   cairo_close_path (cr);
 
   cairo_stroke (cr);
-  cairo_destroy (cr);
 
-#undef RADIUS
+  return TRUE;
 }
 
 static void
@@ -90,26 +97,50 @@ empathy_rounded_rectangle_init (EmpathyRoundedRectangle *self)
       EMPATHY_TYPE_ROUNDED_RECTANGLE, EmpathyRoundedRectanglePriv);
 
   self->priv->border_width = 1;
+  self->priv->round_factor = 2;
+}
+
+static void
+empathy_rounded_rectangle_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (empathy_rounded_rectangle_parent_class)->finalize (object);
 }
 
 static void
 empathy_rounded_rectangle_class_init (EmpathyRoundedRectangleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = empathy_rounded_rectangle_finalize;
+
   g_type_class_add_private (klass, sizeof (EmpathyRoundedRectanglePriv));
 }
 
-ClutterActor *
+static void
+empathy_rounded_rectangle_update_surface_size (EmpathyRoundedRectangle *self)
+{
+  clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (self),
+      self->priv->width + self->priv->border_width,
+      self->priv->height + self->priv->border_width);
+}
+
+EmpathyRoundedRectangle *
 empathy_rounded_rectangle_new (guint width,
-    guint height)
+    guint height,
+    guint round_factor)
 {
-  ClutterActor *self;
+  EmpathyRoundedRectangle *self;
 
-  self = CLUTTER_ACTOR (g_object_new (EMPATHY_TYPE_ROUNDED_RECTANGLE, NULL));
+  self = EMPATHY_ROUNDED_RECTANGLE (g_object_new (EMPATHY_TYPE_ROUNDED_RECTANGLE, NULL));
 
-  clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (self),
-      width, height);
+  self->priv->width = width;
+  self->priv->height = height;
+  self->priv->round_factor = round_factor;
+
+  g_signal_connect (self, "draw", G_CALLBACK (draw_cb), NULL);
 
-  empathy_rounded_rectangle_paint (EMPATHY_ROUNDED_RECTANGLE (self));
+  empathy_rounded_rectangle_update_surface_size (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 
   return self;
 }
@@ -120,7 +151,8 @@ empathy_rounded_rectangle_set_border_width (EmpathyRoundedRectangle *self,
 {
   self->priv->border_width = border_width;
 
-  empathy_rounded_rectangle_paint (self);
+  empathy_rounded_rectangle_update_surface_size (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 }
 
 void
@@ -129,5 +161,5 @@ empathy_rounded_rectangle_set_border_color (EmpathyRoundedRectangle *self,
 {
   self->priv->border_color = *color;
 
-  empathy_rounded_rectangle_paint (self);
+  clutter_cairo_texture_invalidate (CLUTTER_CAIRO_TEXTURE (self));
 }
diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h
index 38d396f39..e4bf72c6e 100644
--- a/src/empathy-rounded-rectangle.h
+++ b/src/empathy-rounded-rectangle.h
@@ -59,8 +59,9 @@ GType empathy_rounded_rectangle_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ROUNDED_RECTANGLE, \
     EmpathyRoundedRectangleClass))
 
-ClutterActor *empathy_rounded_rectangle_new (guint width,
-    guint height);
+EmpathyRoundedRectangle *empathy_rounded_rectangle_new (guint width,
+    guint height,
+    guint round_factor);
 
 void
 empathy_rounded_rectangle_set_border_width (EmpathyRoundedRectangle *self,
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
new file mode 100644
index 000000000..740d84206
--- /dev/null
+++ b/src/empathy-sanity-cleaning.c
@@ -0,0 +1,151 @@
+/*
+ * empathy-sanity-cleaning.c
+ * Code automatically called when starting a specific version of Empathy for
+ * the first time doing misc cleaning.
+ *
+ * Copyright (C) 2012 Collabora Ltd.
+ * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+ *
+ * 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
+ */
+
+#include "config.h"
+
+#include "empathy-sanity-cleaning.h"
+
+#include <telepathy-glib/telepathy-glib.h>
+
+#include <libempathy/empathy-gsettings.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
+
+/*
+ * This number has to be increased each time a new task is added or modified.
+ *
+ * If the number stored in gsettings is lower than it, all the tasks will
+ * be executed.
+ */
+#define SANITY_CLEANING_NUMBER 1
+
+static void
+account_update_parameters_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  TpAccount *account = TP_ACCOUNT (source);
+
+  if (!tp_account_update_parameters_finish (account, result, NULL, &error))
+    {
+      DEBUG ("Failed to update parameters of account '%s': %s",
+          tp_account_get_path_suffix (account), error->message);
+
+      g_error_free (error);
+      return;
+    }
+
+  tp_account_reconnect_async (account, NULL, NULL);
+}
+
+/* Make sure XMPP accounts don't have a negative priority (bgo #671452) */
+static void
+fix_xmpp_account_priority (TpAccountManager *am)
+{
+  GList *accounts, *l;
+
+  accounts = tp_account_manager_get_valid_accounts (am);
+  for (l = accounts; l != NULL; l = g_list_next (l))
+    {
+      TpAccount *account = l->data;
+      GHashTable *params;
+      gint priority;
+
+      if (tp_strdiff (tp_account_get_protocol (account), "jabber"))
+        continue;
+
+      params = (GHashTable *) tp_account_get_parameters (account);
+      if (params == NULL)
+        continue;
+
+      priority = tp_asv_get_int32 (params, "priority", NULL);
+      if (priority >= 0)
+        continue;
+
+      DEBUG ("Resetting XMPP priority of account '%s' to 0",
+          tp_account_get_path_suffix (account));
+
+      params = tp_asv_new (
+          "priority", G_TYPE_INT, 0,
+          NULL);
+
+      tp_account_update_parameters_async (account, params, NULL,
+          account_update_parameters_cb, NULL);
+
+      g_hash_table_unref (params);
+    }
+
+  g_list_free (accounts);
+}
+
+static void
+run_sanity_cleaning_tasks (TpAccountManager *am)
+{
+  DEBUG ("Starting sanity cleaning tasks");
+
+  fix_xmpp_account_priority (am);
+}
+
+static void
+am_prepare_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  TpAccountManager *am = TP_ACCOUNT_MANAGER (source);
+
+  if (!tp_proxy_prepare_finish (am, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  run_sanity_cleaning_tasks (am);
+}
+
+void empathy_sanity_checking_run_if_needed (void)
+{
+  GSettings *settings;
+  guint number;
+  TpAccountManager *am;
+
+  settings = g_settings_new (EMPATHY_PREFS_SCHEMA);
+  number = g_settings_get_uint (settings, EMPATHY_PREFS_SANITY_CLEANING_NUMBER);
+
+  if (number == SANITY_CLEANING_NUMBER)
+    goto out;
+
+  am = tp_account_manager_dup ();
+
+  tp_proxy_prepare_async (am, NULL, am_prepare_cb, NULL);
+
+  g_settings_set_uint (settings, EMPATHY_PREFS_SANITY_CLEANING_NUMBER,
+      SANITY_CLEANING_NUMBER);
+
+  g_object_unref (am);
+out:
+  g_object_unref (settings);
+}
diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h
new file mode 100644
index 000000000..593f9adce
--- /dev/null
+++ b/src/empathy-sanity-cleaning.h
@@ -0,0 +1,27 @@
+/*
+ * empathy-sanity-cleaning.h
+ *
+ * Copyright (C) 2012 Collabora Ltd.
+ * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+ *
+ * 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
+ */
+
+#ifndef __EMPATHY_SANITY_CLEANING_H__
+#define __EMPATHY_SANITY_CLEANING_H__
+
+void empathy_sanity_checking_run_if_needed (void);
+
+#endif
diff --git a/src/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c
index 1c25ae253..713d441df 100644
--- a/src/empathy-streamed-media-factory.c
+++ b/src/empathy-streamed-media-factory.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/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index a3c539773..5e2cac50f 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.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>
@@ -26,8 +27,7 @@
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-farsight/channel.h>
-#include <telepathy-farsight/stream.h>
+#include <telepathy-farstream/telepathy-farstream.h>
 
 #include <libempathy/empathy-utils.h>
 
@@ -45,7 +45,7 @@ enum {
   CONFERENCE_ADDED,
   SRC_PAD_ADDED,
   SINK_PAD_ADDED,
-  REQUEST_RESOURCE,
+  START_RECEIVING,
   CLOSED,
   STREAM_CLOSED,
   CANDIDATES_CHANGED,
@@ -359,8 +359,8 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
-  signals[REQUEST_RESOURCE] =
-    g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
+  signals[START_RECEIVING] =
+    g_signal_new ("start-receiving", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       g_signal_accumulator_true_handled, NULL,
       g_cclosure_marshal_generic,
@@ -377,7 +377,7 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
     g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
       g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, TF_TYPE_STREAM);
+      G_TYPE_NONE, 1, TF_TYPE_CONTENT);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
@@ -539,7 +539,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler
     return;
 
   if (s != NULL &&
-      gst_structure_has_name (s, "farsight-send-codec-changed"))
+      gst_structure_has_name (s, "farstream-send-codec-changed"))
     {
       const GValue *val;
       FsCodec *codec;
@@ -554,7 +554,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler
       update_sending_codec (handler, codec, session);
     }
   else if (s != NULL &&
-      gst_structure_has_name (s, "farsight-recv-codecs-changed"))
+      gst_structure_has_name (s, "farstream-recv-codecs-changed"))
     {
       const GValue *val;
       GList *codecs;
@@ -569,7 +569,7 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler
       update_receiving_codec (handler, codecs, stream);
     }
   else if (s != NULL &&
-      gst_structure_has_name (s, "farsight-new-active-candidate-pair"))
+      gst_structure_has_name (s, "farstream-new-active-candidate-pair"))
     {
       const GValue *val;
       FsCandidate *remote_candidate, *local_candidate;
@@ -591,8 +591,8 @@ empathy_streamed_media_handler_bus_message (EmpathyStreamedMediaHandler *handler
 }
 
 static void
-empathy_streamed_media_handler_tf_channel_session_created_cb (TfChannel *tfchannel,
-  FsConference *conference, FsParticipant *participant,
+empathy_streamed_media_handler_tf_channel_conference_added_cb (TfChannel *tfchannel,
+  FsConference *conference,
   EmpathyStreamedMediaHandler *self)
 {
   g_signal_emit (G_OBJECT (self), signals[CONFERENCE_ADDED], 0,
@@ -602,86 +602,85 @@ empathy_streamed_media_handler_tf_channel_session_created_cb (TfChannel *tfchann
 static gboolean
 src_pad_added_error_idle (gpointer data)
 {
-  TfStream *stream = data;
+  TfContent *content = data;
 
-  tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
-      "Could not link sink");
-  g_object_unref (stream);
+  tf_content_error_literal (content, "Could not link sink");
+  g_object_unref (content);
 
   return FALSE;
 }
 
 static void
-empathy_streamed_media_handler_tf_stream_src_pad_added_cb (TfStream *stream,
-  GstPad *pad, FsCodec *codec, EmpathyStreamedMediaHandler  *handler)
+empathy_streamed_media_handler_tf_content_src_pad_added_cb (TfContent *content,
+  guint handle,
+  FsStream *stream,
+  GstPad *pad,
+  FsCodec *codec,
+  EmpathyStreamedMediaHandler  *handler)
 {
   guint media_type;
   gboolean retval;
 
-  g_object_get (stream, "media-type", &media_type, NULL);
+  g_object_get (content, "media-type", &media_type, NULL);
 
   g_signal_emit (G_OBJECT (handler), signals[SRC_PAD_ADDED], 0,
       pad, media_type, &retval);
 
   if (!retval)
-    g_idle_add (src_pad_added_error_idle, g_object_ref (stream));
+    g_idle_add (src_pad_added_error_idle, g_object_ref (content));
 }
 
 
 static gboolean
-empathy_streamed_media_handler_tf_stream_request_resource_cb (TfStream *stream,
-  guint direction, EmpathyTpStreamedMedia *call)
+empathy_streamed_media_handler_tf_content_start_receiving_cb (TfContent *content,
+    guint *handles, guint handle_count, EmpathyTpStreamedMedia *call)
 {
-  gboolean ret;
+  gboolean ret = FALSE;
   guint media_type;
 
-  g_object_get (G_OBJECT (stream), "media-type", &media_type, NULL);
+  g_object_get (G_OBJECT (content), "media-type", &media_type, NULL);
 
   g_signal_emit (G_OBJECT (call),
-    signals[REQUEST_RESOURCE], 0, media_type, direction, &ret);
+    signals[START_RECEIVING], 0, media_type, &ret);
 
   return ret;
 }
 
 static void
-empathy_streamed_media_handler_tf_stream_closed_cb (TfStream *stream,
-  EmpathyStreamedMediaHandler *handler)
+empathy_streamed_media_handler_tf_content_removed_cb (TfChannel *channel,
+    TfContent *content, EmpathyStreamedMediaHandler *handler)
 {
-  g_signal_emit (handler, signals[STREAM_CLOSED], 0, stream);
+  g_signal_emit (handler, signals[STREAM_CLOSED], 0, content);
 }
 
 static void
-empathy_streamed_media_handler_tf_channel_stream_created_cb (TfChannel *tfchannel,
-  TfStream *stream, EmpathyStreamedMediaHandler *handler)
+empathy_streamed_media_handler_tf_channel_content_added_cb (TfChannel *tfchannel,
+  TfContent *content, EmpathyStreamedMediaHandler *handler)
 {
   guint media_type;
   GstPad *spad;
   gboolean retval;
-  FsStream *fs_stream;
-  GList *codecs;
   FsSession *session;
   FsCodec *codec;
 
-  g_signal_connect (stream, "src-pad-added",
-      G_CALLBACK (empathy_streamed_media_handler_tf_stream_src_pad_added_cb), handler);
-  g_signal_connect (stream, "request-resource",
-      G_CALLBACK (empathy_streamed_media_handler_tf_stream_request_resource_cb),
+  g_signal_connect (content, "src-pad-added",
+      G_CALLBACK (empathy_streamed_media_handler_tf_content_src_pad_added_cb), handler);
+
+  g_signal_connect (content, "start-receiving",
+      G_CALLBACK (empathy_streamed_media_handler_tf_content_start_receiving_cb),
         handler);
-  g_signal_connect (stream, "closed",
-      G_CALLBACK (empathy_streamed_media_handler_tf_stream_closed_cb), handler);
 
-  g_object_get (stream, "media-type", &media_type,
+  g_object_get (content, "media-type", &media_type,
     "sink-pad", &spad, NULL);
 
   g_signal_emit (G_OBJECT (handler), signals[SINK_PAD_ADDED], 0,
       spad, media_type, &retval);
 
  if (!retval)
-      tf_stream_error (stream, TP_MEDIA_STREAM_ERROR_MEDIA_ERROR,
-          "Could not link source");
+   tf_content_error_literal (content, "Could not link source");
 
  /* Get sending codec */
- g_object_get (stream, "farsight-session", &session, NULL);
+ g_object_get (content, "fs-session", &session, NULL);
  g_object_get (session, "current-send-codec", &codec, NULL);
 
  update_sending_codec (handler, codec, session);
@@ -689,15 +688,6 @@ empathy_streamed_media_handler_tf_channel_stream_created_cb (TfChannel *tfchanne
  tp_clear_object (&session);
  tp_clear_object (&codec);
 
- /* Get receiving codec */
- g_object_get (stream, "farsight-stream", &fs_stream, NULL);
- g_object_get (fs_stream, "current-recv-codecs", &codecs, NULL);
-
- update_receiving_codec (handler, codecs, fs_stream);
-
- fs_codec_list_destroy (codecs);
- tp_clear_object (&fs_stream);
-
  gst_object_unref (spad);
 }
 
@@ -709,26 +699,45 @@ empathy_streamed_media_handler_tf_channel_closed_cb (TfChannel *tfchannel,
 }
 
 static void
-empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self)
+empathy_streamed_media_handler_start_tpfs (GAsyncInitable *initable,
+    GAsyncResult *res, EmpathyStreamedMediaHandler *self)
 {
   EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
-  TpChannel *channel;
-
-  g_object_get (priv->call, "channel", &channel, NULL);
-
-  g_assert (channel != NULL);
-
-  priv->tfchannel = tf_channel_new (channel);
+  GError *error = NULL;
+  GPtrArray *conferences;
 
-  /* Set up the telepathy farsight channel */
-  g_signal_connect (priv->tfchannel, "session-created",
-      G_CALLBACK (empathy_streamed_media_handler_tf_channel_session_created_cb), self);
-  g_signal_connect (priv->tfchannel, "stream-created",
-      G_CALLBACK (empathy_streamed_media_handler_tf_channel_stream_created_cb), self);
-  g_signal_connect (priv->tfchannel, "closed",
-      G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
+  if (g_async_initable_init_finish (initable, res, &error))
+    {
+      priv->tfchannel = TF_CHANNEL (initable);
+
+      /* Set up the telepathy farsight channel */
+      g_signal_connect (priv->tfchannel, "fs-conference-added",
+          G_CALLBACK (empathy_streamed_media_handler_tf_channel_conference_added_cb), self);
+      g_signal_connect (priv->tfchannel, "content-added",
+          G_CALLBACK (empathy_streamed_media_handler_tf_channel_content_added_cb), self);
+      g_signal_connect (priv->tfchannel, "content-removed",
+          G_CALLBACK (empathy_streamed_media_handler_tf_content_removed_cb),
+          self);
+      g_signal_connect (priv->tfchannel, "closed",
+          G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
+
+      g_object_get (priv->tfchannel, "fs-conferences", &conferences, NULL);
+      if (conferences)
+        {
+          if (conferences->len > 0)
+            empathy_streamed_media_handler_tf_channel_conference_added_cb (
+                priv->tfchannel, g_ptr_array_index (conferences, 0), self);
+          g_ptr_array_unref (conferences);
+        }
 
-  g_object_unref (channel);
+      empathy_tp_streamed_media_accept_incoming_call (priv->call);
+    }
+  else
+    {
+      g_warning ("Error creating tf channel");
+      g_clear_error (&error);
+    }
+  g_object_unref (self);
 }
 
 static void
@@ -758,7 +767,10 @@ empathy_streamed_media_handler_request_cb (GObject *source,
 
   g_object_notify (G_OBJECT (self), "tp-call");
 
-  empathy_streamed_media_handler_start_tpfs (self);
+
+  tf_channel_new_async (channel,
+      (GAsyncReadyCallback) empathy_streamed_media_handler_start_tpfs,
+      g_object_ref (self));
 
   g_object_unref (channel);
 }
@@ -774,8 +786,14 @@ empathy_streamed_media_handler_start_call (EmpathyStreamedMediaHandler *handler,
 
   if (priv->call != NULL)
     {
-      empathy_streamed_media_handler_start_tpfs (handler);
-      empathy_tp_streamed_media_accept_incoming_call (priv->call);
+      TpChannel *channel;
+
+      g_object_get (priv->call, "channel", &channel, NULL);
+
+      tf_channel_new_async (channel,
+          (GAsyncReadyCallback)  empathy_streamed_media_handler_start_tpfs,
+          g_object_ref (handler));
+      g_object_unref (channel);
       return;
     }
 
diff --git a/src/empathy-streamed-media-handler.h b/src/empathy-streamed-media-handler.h
index ab655b8e4..429c95447 100644
--- a/src/empathy-streamed-media-handler.h
+++ b/src/empathy-streamed-media-handler.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 
 #include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
+#include <farstream/fs-conference.h>
 
 #include <libempathy/empathy-tp-streamed-media.h>
 #include <libempathy/empathy-contact.h>
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index df3fbab00..87887e75f 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -31,11 +31,11 @@
 #include <glib/gi18n.h>
 
 #include <telepathy-glib/util.h>
-#include <telepathy-farsight/channel.h>
-#include <telepathy-glib/util.h>
 
-#include <gst/farsight/fs-element-added-notifier.h>
-#include <gst/farsight/fs-utils.h>
+#include <telepathy-farstream/telepathy-farstream.h>
+
+#include <farstream/fs-element-added-notifier.h>
+#include <farstream/fs-utils.h>
 
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-utils.h>
@@ -372,7 +372,8 @@ empathy_streamed_media_window_create_video_input_add_slider (EmpathyStreamedMedi
   gchar *label_text, GtkWidget *bin)
 {
    GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-   GtkWidget *scale = gtk_vscale_new_with_range (0, 100, 10);
+   GtkWidget *scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0,
+       100, 10);
    GtkWidget *label = gtk_label_new (label_text);
 
    gtk_widget_set_sensitive (scale, FALSE);
@@ -540,7 +541,8 @@ empathy_streamed_media_window_create_audio_input (EmpathyStreamedMediaWindow *se
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 3);
 
-  priv->volume_scale = gtk_vscale_new_with_range (0, 150, 100);
+  priv->volume_scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0,
+      150, 100);
   gtk_range_set_inverted (GTK_RANGE (priv->volume_scale), TRUE);
   label = gtk_label_new (_("Volume"));
 
@@ -1759,8 +1761,8 @@ empathy_streamed_media_window_conference_added_cb (EmpathyStreamedMediaHandler *
 }
 
 static gboolean
-empathy_streamed_media_window_request_resource_cb (EmpathyStreamedMediaHandler *handler,
-  FsMediaType type, FsStreamDirection direction, gpointer user_data)
+empathy_streamed_media_window_start_receiving_cb (EmpathyStreamedMediaHandler *handler,
+  FsMediaType type,gpointer user_data)
 {
   EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data);
   EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self);
@@ -1768,9 +1770,6 @@ empathy_streamed_media_window_request_resource_cb (EmpathyStreamedMediaHandler *
   if (type != FS_MEDIA_TYPE_VIDEO)
     return TRUE;
 
-  if (direction == FS_DIRECTION_RECV)
-    return TRUE;
-
   /* video and direction is send */
   return priv->video_input != NULL;
 }
@@ -1952,13 +1951,13 @@ empathy_streamed_media_window_channel_closed_cb (EmpathyStreamedMediaHandler *ha
 
 static void
 empathy_streamed_media_window_channel_stream_closed_cb (EmpathyStreamedMediaHandler *handler,
-    TfStream *stream, gpointer user_data)
+    TfContent *content, gpointer user_data)
 {
   EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data);
   EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self);
   guint media_type;
 
-  g_object_get (stream, "media-type", &media_type, NULL);
+  g_object_get (content, "media-type", &media_type, NULL);
 
   /*
    * This assumes that there is only one video stream per channel...
@@ -2719,8 +2718,8 @@ empathy_streamed_media_window_realized_cb (GtkWidget *widget, EmpathyStreamedMed
 
   g_signal_connect (priv->handler, "conference-added",
     G_CALLBACK (empathy_streamed_media_window_conference_added_cb), window);
-  g_signal_connect (priv->handler, "request-resource",
-    G_CALLBACK (empathy_streamed_media_window_request_resource_cb), window);
+  g_signal_connect (priv->handler, "start-receiving",
+    G_CALLBACK (empathy_streamed_media_window_start_receiving_cb), window);
   g_signal_connect (priv->handler, "closed",
     G_CALLBACK (empathy_streamed_media_window_channel_closed_cb), window);
   g_signal_connect (priv->handler, "src-pad-added",
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 3b9e6f8fc..8c9c75015 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.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/src/empathy-video-widget.c b/src/empathy-video-widget.c
index 0eee9e0bc..adca53ef6 100644
--- a/src/empathy-video-widget.c
+++ b/src/empathy-video-widget.c
@@ -25,7 +25,7 @@
 
 #include <gdk/gdkx.h>
 #include <gst/interfaces/xoverlay.h>
-#include <gst/farsight/fs-element-added-notifier.h>
+#include <farstream/fs-element-added-notifier.h>
 
 #include "empathy-video-widget.h"
 
@@ -130,8 +130,6 @@ empathy_video_widget_constructed (GObject *object)
   gst_object_ref (priv->videosink);
   gst_object_sink (priv->videosink);
 
-  priv->sink_pad = gst_element_get_static_pad (priv->videosink, "sink");
-
   sink = gst_element_factory_make ("gconfvideosink", NULL);
   g_assert (sink != NULL);
 
diff --git a/src/empathy.c b/src/empathy.c
index f59a54f17..2ed3bab5d 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,8 +44,6 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <telepathy-logger/log-manager.h>
 
 #include <libempathy/empathy-client-factory.h>
@@ -850,11 +848,11 @@ main (int argc, char *argv[])
   g_type_init ();
 
 #ifdef HAVE_LIBCHAMPLAIN
-  gtk_clutter_init (&argc, &argv);
+  g_return_val_if_fail (gtk_clutter_init (&argc, &argv) ==
+      CLUTTER_INIT_SUCCESS, 1);
 #endif
 
   g_type_init ();
-  tpy_cli_init ();
   empathy_init ();
   gtk_init (&argc, &argv);
   empathy_gtk_init ();
diff --git a/telepathy-yell b/telepathy-yell
deleted file mode 160000
-Subproject ec9faee52bf288d811f51071e405153b1a5b5a6
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 2f02468d0..6c53f07ad 100644
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index a79a7a287..feef03b51 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
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;
-}
diff --git a/tools/.gitignore b/tools/.gitignore
index 2578e9883..d6ba5d9dc 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1,4 @@
 _gen
 extensions.html
 telepathy-glib-env
+empathy-env
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 96cc60f58..49bcb04b5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,11 +1,15 @@
 abs_top_builddir = @abs_top_builddir@
 
-noinst_SCRIPTS = telepathy-glib-env
+noinst_SCRIPTS = telepathy-glib-env empathy-env
 
 telepathy-glib-env: telepathy-glib-env.in Makefile
 	sed -e 's![@]abs_top_builddir[@]!$(abs_top_builddir)!' $< > $@
 	chmod +x $@
 
+empathy-env: empathy-env.in Makefile
+	sed -e 's![@]abs_top_builddir[@]!$(abs_top_builddir)!' $< > $@
+	chmod +x $@
+
 EXTRA_DIST = \
     c-constants-gen.py \
     check-coding-style.mk \
@@ -34,6 +38,7 @@ EXTRA_DIST = \
     telepathy.am \
     telepathy-glib.supp \
     telepathy-glib-env.in \
+    empathy-env.in \
     test-wrapper.sh \
     with-session-bus.sh \
     xincludator.py
diff --git a/tools/empathy-env.in b/tools/empathy-env.in
new file mode 100644
index 000000000..3de477910
--- /dev/null
+++ b/tools/empathy-env.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+abs_top_builddir="@abs_top_builddir@"
+export abs_top_builddir
+EMPATHY_SRCDIR=$abs_top_builddir
+export EMPATHY_SRCDIR
+GSETTINGS_SCHEMA_DIR="${EMPATHY_SRCDIR}/data/"
+export GSETTINGS_SCHEMA_DIR
+
+exec "$@"